diff options
author | Caolán McNamara <caolanm@redhat.com> | 2021-11-17 15:20:33 +0000 |
---|---|---|
committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2021-11-18 09:59:10 +0100 |
commit | f0e816412c386de976228b2232c23c31fd7f2d2c (patch) | |
tree | 9c02a269c144b59ba63f565d799102dcb149bf28 /sc | |
parent | 4967ac966be3bc84e5db210f6d5d96d45c877db7 (diff) |
tdf#142420 color menu should be a child of the autofilter, not a sibling
which is why it doesn't appear at all under wayland. This should also
get it positioned better rather than using a fixed pixel offset.
Change-Id: I9a4193c27b4172469cea3d980c86cff9ca701ca2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125360
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/ui/cctrl/checklistmenu.cxx | 9 | ||||
-rw-r--r-- | sc/source/ui/inc/checklistmenu.hxx | 5 | ||||
-rw-r--r-- | sc/source/ui/view/gridwin.cxx | 6 |
3 files changed, 16 insertions, 4 deletions
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 9be4712ce2e0..7e4f1b9fbfdc 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -278,6 +278,13 @@ void ScCheckListMenuControl::queueCloseSubMenu() maCloseTimer.maTimer.Start(); } +tools::Rectangle ScCheckListMenuControl::GetSubMenuParentRect() +{ + if (!mxMenu->get_selected(mxScratchIter.get())) + return tools::Rectangle(); + return mxMenu->get_row_area(*mxScratchIter); +} + void ScCheckListMenuControl::launchSubMenu(bool bSetMenuPos) { ScCheckListMenuWindow* pSubMenu = maOpenTimer.mpSubMenu; @@ -287,7 +294,7 @@ void ScCheckListMenuControl::launchSubMenu(bool bSetMenuPos) if (!mxMenu->get_selected(mxScratchIter.get())) return; - tools::Rectangle aRect = mxMenu->get_row_area(*mxScratchIter); + tools::Rectangle aRect = GetSubMenuParentRect(); ScCheckListMenuControl& rSubMenuControl = pSubMenu->get_widget(); rSubMenuControl.StartPopupMode(aRect, FloatWinPopupFlags::Right); if (bSetMenuPos) diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index 5bddd4490ae8..427f29c3f7d3 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -178,6 +178,11 @@ public: */ void terminateAllPopupMenus(); + /** + * Get the area of the active row. Suitable as the parent rectangle + * argument for Executing a popup + */ + tools::Rectangle GetSubMenuParentRect(); private: std::vector<MenuItemData> maMenuItems; diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index e9f963dcaa06..05d75755aecb 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -961,9 +961,9 @@ void ScGridWindow::UpdateAutoFilterFromMenu(AutoFilterMode eMode) } i++; } - Point pos(mpAutoFilterPopup->GetPosPixel()); - pos.Move(150, 0); - sal_uInt16 nSelected = pColorMenu->Execute(this, pos); + + tools::Rectangle aRect = rControl.GetSubMenuParentRect(); + sal_uInt16 nSelected = pColorMenu->Execute(mpAutoFilterPopup, aRect, PopupMenuFlags::ExecuteRight); pColorMenu.disposeAndClear(); rControl.terminateAllPopupMenus(); |