summaryrefslogtreecommitdiff
path: root/vcl/source/app
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-12-09 17:28:00 +0000
committerCaolán McNamara <caolanm@redhat.com>2020-12-09 21:24:21 +0100
commitb6c2c72ceeab757fb33f2412afd291c3b21fe2ba (patch)
treee362ed5768cb741078cef3ada4b179784f5051ad /vcl/source/app
parentebc76496be42f1ca9141c94cc544a3fa922cad38 (diff)
tdf#138778 add has_child_focus which considers a related popup a 'child'
Change-Id: Iab23e399f2650ece702fb1f62d1387acca472b42 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107480 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/source/app')
-rw-r--r--vcl/source/app/salvtables.cxx7
1 files changed, 3 insertions, 4 deletions
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 03f68e381163..e8dd4acd4808 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -271,6 +271,8 @@ bool SalInstanceWidget::has_focus() const { return m_xWidget->HasFocus(); }
bool SalInstanceWidget::is_active() const { return m_xWidget->IsActive(); }
+bool SalInstanceWidget::has_child_focus() const { return m_xWidget->HasChildPathFocus(true); }
+
void SalInstanceWidget::set_has_default(bool has_default)
{
m_xWidget->set_property("has-default", OUString::boolean(has_default));
@@ -5776,10 +5778,7 @@ public:
return m_xExpander->get_label_widget()->HasFocus() || SalInstanceContainer::has_focus();
}
- virtual void grab_focus() override
- {
- return m_xExpander->get_label_widget()->GrabFocus();
- }
+ virtual void grab_focus() override { return m_xExpander->get_label_widget()->GrabFocus(); }
virtual ~SalInstanceExpander() override
{