diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2022-06-20 20:10:30 +0200 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2022-07-04 08:27:24 +0200 |
| commit | 044b6d343ecdd31670bbd824a8758ee1071327cf (patch) | |
| tree | 8f2a19a9834a1a37b9ade06645bf75466ee70ace /vcl | |
| parent | d2dfc0c4286057f5d8dda178817de3503c3a7d29 (diff) | |
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
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136603
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/jsdialog/jsdialogbuilder.hxx | 8 | ||||
| -rw-r--r-- | vcl/jsdialog/enabled.cxx | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx b/vcl/inc/jsdialog/jsdialogbuilder.hxx index 5e7437b2725a..6a7a9632a27c 100644 --- a/vcl/inc/jsdialog/jsdialogbuilder.hxx +++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx @@ -417,6 +417,14 @@ 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 a37d77602766..380fb2d3e9d2 100644 --- a/vcl/jsdialog/enabled.cxx +++ b/vcl/jsdialog/enabled.cxx @@ -121,19 +121,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" |