diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-02-15 20:16:44 +0000 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2021-02-17 10:59:40 +0100 |
| commit | 97a1d170b5f45c6cf9fc2c56dc4526d0e3f8423a (patch) | |
| tree | a288c3c26e70e13863bc6d241a22ae4002cb3454 /sw | |
| parent | 640951c1ac64ff0f7ab2c033c9a2f00ccf0363dc (diff) | |
tdf#140387 grab focus to first panel widget on panel gaining focus
otherwise focus is getting lost in these currently mixed vcl+gtk widget
panels.
Change-Id: I6488ddfc98afdedb55bb3217f3877e96258dd65a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110956
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/uibase/sidebar/StylePresetsPanel.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/sidebar/TableEditPanel.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/sidebar/ThemePanel.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/sidebar/WrapPropertyPanel.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/utlui/navipi.cxx | 2 |
5 files changed, 10 insertions, 0 deletions
diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.cxx b/sw/source/uibase/sidebar/StylePresetsPanel.cxx index f24bf135c706..12e400b939b9 100644 --- a/sw/source/uibase/sidebar/StylePresetsPanel.cxx +++ b/sw/source/uibase/sidebar/StylePresetsPanel.cxx @@ -152,6 +152,8 @@ StylePresetsPanel::StylePresetsPanel(vcl::Window* pParent, mxValueSet->SetDoubleClickHdl(LINK(this, StylePresetsPanel, DoubleClickHdl)); RefreshList(); + + m_pInitialFocusWidget = mxValueSet->GetDrawingArea(); } void StylePresetsPanel::RefreshList() diff --git a/sw/source/uibase/sidebar/TableEditPanel.cxx b/sw/source/uibase/sidebar/TableEditPanel.cxx index de053ddaa837..de91b0e37737 100644 --- a/sw/source/uibase/sidebar/TableEditPanel.cxx +++ b/sw/source/uibase/sidebar/TableEditPanel.cxx @@ -138,6 +138,8 @@ TableEditPanel::TableEditPanel(vcl::Window* pParent, if (comphelper::LibreOfficeKit::isActive()) m_xMisc->set_item_visible(".uno:InsertFormula", false); + + m_pInitialFocusWidget = &m_xRowHeightEdit->get_widget(); } TableEditPanel::~TableEditPanel() { disposeOnce(); } diff --git a/sw/source/uibase/sidebar/ThemePanel.cxx b/sw/source/uibase/sidebar/ThemePanel.cxx index f4c4951f6546..a25b08806d91 100644 --- a/sw/source/uibase/sidebar/ThemePanel.cxx +++ b/sw/source/uibase/sidebar/ThemePanel.cxx @@ -447,6 +447,8 @@ ThemePanel::ThemePanel(vcl::Window* pParent, if (!aColorSets.empty()) mxValueSetColors->SelectItem(1); // ItemId 1, position 0 + + m_pInitialFocusWidget = mxListBoxFonts.get(); } ThemePanel::~ThemePanel() diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx index bc64fd8b7724..08c6405f7a31 100644 --- a/sw/source/uibase/sidebar/WrapPropertyPanel.cxx +++ b/sw/source/uibase/sidebar/WrapPropertyPanel.cxx @@ -79,6 +79,8 @@ WrapPropertyPanel::WrapPropertyPanel( SpacingListBox::Fill(IsInch(eMetric) ? SpacingType::SPACING_INCH : SpacingType::SPACING_CM, *mxSpacingLB); Initialize(); + + m_pInitialFocusWidget = mxWrapOptions.get(); } WrapPropertyPanel::~WrapPropertyPanel() diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index e5e139cba20f..4961c99deaaa 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -648,6 +648,8 @@ SwNavigationPI::SwNavigationPI(vcl::Window* pParent, m_xDocListBox->set_accessible_name(m_aStatusArr[3]); m_aExpandedSize = GetOptimalSize(); + + m_pInitialFocusWidget = m_xContent1ToolBox.get(); } SwNavigationPI::~SwNavigationPI() |