From b6c2c72ceeab757fb33f2412afd291c3b21fe2ba Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 9 Dec 2020 17:28:00 +0000 Subject: tdf#138778 add has_child_focus which considers a related popup a 'child' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Iab23e399f2650ece702fb1f62d1387acca472b42 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107480 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- vcl/source/app/salvtables.cxx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'vcl/source/app') 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 { -- cgit