summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-07-02 10:54:52 +0100
committerCaolán McNamara <caolanm@redhat.com>2020-07-02 17:54:36 +0200
commiteb4806aaf3ec63ba9260a57315cc2ee442150e12 (patch)
treec40fccb4a599b5268f62c11db1a9a3d830b879d0 /cui
parentedca1aa90ad1ec2f8959effc7198f227e3be91d4 (diff)
focus grabbed to options extension page when browsing options
Window::Show grabs focus to the window if its a system window by default and XWindow::set_visible calls Show with default args Change-Id: Ief3b44068b867fe22f829de5d9722832692a35fe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97681 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui')
-rw-r--r--cui/source/options/treeopt.cxx9
1 files changed, 9 insertions, 0 deletions
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 2d6b104e1d9b..0e63a774d394 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -2044,6 +2044,15 @@ void ExtensionsTabPage::Show()
{
if (!m_xPageParent.is())
return;
+
+ VclPtr<vcl::Window> xPageParent = VCLUnoHelper::GetWindow(m_xPageParent);
+ if (xPageParent)
+ {
+ // NoActivate otherwise setVisible will call Window::Show which will grab
+ // focus to the page by default
+ xPageParent->Show(true, ShowFlags::NoActivate);
+ }
+
m_xPageParent->setVisible(true);
}