sc/source/ui/view/gridwin.cxx | 2 +- vcl/inc/jsdialog/jsdialogbuilder.hxx | 9 +++++++++ vcl/jsdialog/enabled.cxx | 6 +++--- 3 files changed, 13 insertions(+), 4 deletions(-)
New commits: commit 759578a196e41a09447105938aadddf1c1965dbd Author: Szymon Kłos <[email protected]> AuthorDate: Tue Jun 21 11:26:22 2022 +0200 Commit: Szymon Kłos <[email protected]> CommitDate: Tue Jun 21 11:26:22 2022 +0200 lok: fix position for cell item list dropdown Change-Id: I911199970d8c01fcf0767b974936d077f48fc89c diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 9982f3dbf24a..3e3fbbe37768 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -1391,7 +1391,7 @@ void ScGridWindow::LaunchDataSelectMenu( SCCOL nCol, SCROW nRow ) aPos.AdjustX( -nSizeX ); tools::Rectangle aCellRect(aPos, Size(nSizeX, nSizeY)); - weld::Window* pParent = weld::GetPopupParent(*this, aCellRect); + weld::Window* pParent = comphelper::LibreOfficeKit::isActive() ? GetFrameWeld() : weld::GetPopupParent(*this, aCellRect); mpFilterBox = std::make_shared<ScFilterListBox>(pParent, this, nCol, nRow, ScFilterBoxMode::DataSelect); mpFilterBox->connect_closed(LINK(this, ScGridWindow, PopupModeEndHdl)); weld::TreeView& rFilterBox = mpFilterBox->get_widget(); commit 9301e655fb0e0ef59e35724cb4fa1d6789b5a302 Author: Szymon Kłos <[email protected]> AuthorDate: Mon Jun 20 20:10:30 2022 +0200 Commit: Szymon Kłos <[email protected]> CommitDate: Tue Jun 21 09:20:22 2022 +0200 jsdialog: send grab_focus action - disable jsdialogs for navigator panel for now because it breaks tests but is not used in online yet Change-Id: Ib91050363add8cda1c386627c312b79e0f62b99e diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx b/vcl/inc/jsdialog/jsdialogbuilder.hxx index 098e8279039b..304b9c330795 100644 --- a/vcl/inc/jsdialog/jsdialogbuilder.hxx +++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx @@ -418,6 +418,15 @@ public: sendUpdate(); } + virtual void grab_focus() override + { + BaseInstanceClass::grab_focus(); + std::unique_ptr<jsdialog::ActionDataMap> pMap + = std::make_unique<jsdialog::ActionDataMap>(); + (*pMap)[ACTION_TYPE] = "grab_focus"; + sendAction(std::move(pMap)); + } + virtual void sendClose() override { if (m_pSender) diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx index 7984dab3d6f8..8bc49e8bda20 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -124,19 +124,19 @@ bool isBuilderEnabledForSidebar(std::u16string_view rUIFile) || rUIFile == u"modules/simpress/ui/masterpagepanelrecent.ui" || rUIFile == u"modules/simpress/ui/slidetransitionspanel.ui" || rUIFile == u"modules/simpress/ui/tabledesignpanel.ui" - || rUIFile == u"modules/simpress/ui/navigatorpanel.ui" + //|| rUIFile == u"modules/simpress/ui/navigatorpanel.ui" || rUIFile == u"modules/simpress/ui/sidebarslidebackground.ui" || rUIFile == u"modules/scalc/ui/sidebaralignment.ui" || rUIFile == u"modules/scalc/ui/sidebarcellappearance.ui" || rUIFile == u"modules/scalc/ui/sidebarnumberformat.ui" - || rUIFile == u"modules/scalc/ui/navigatorpanel.ui" + //|| rUIFile == u"modules/scalc/ui/navigatorpanel.ui" || rUIFile == u"modules/scalc/ui/functionpanel.ui" || rUIFile == u"modules/swriter/ui/pagestylespanel.ui" || rUIFile == u"modules/swriter/ui/pageformatpanel.ui" || rUIFile == u"modules/swriter/ui/pageheaderpanel.ui" || rUIFile == u"modules/swriter/ui/pagefooterpanel.ui" || rUIFile == u"modules/swriter/ui/sidebarwrap.ui" - || rUIFile == u"modules/swriter/ui/navigatorpanel.ui" + //|| rUIFile == u"modules/swriter/ui/navigatorpanel.ui" || rUIFile == u"modules/swriter/ui/managechangessidebar.ui" || rUIFile == u"svx/ui/inspectortextpanel.ui" || rUIFile == u"modules/swriter/ui/sidebarstylepresets.ui"
