summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-11-20 10:16:07 +0000
committerCaolán McNamara <caolanm@redhat.com>2020-11-20 21:06:51 +0100
commit3e15955877eafc86654bd90cbb0db926cd30ed4f (patch)
treede3e274e0c9956126f2a1370328b4dcad727179c
parentdf0c70d52ccc7e9a7c453d758ef210735f513082 (diff)
check expander label for focus and grab focus to that label
Change-Id: I91f3b012605416afd53e5d445ec10d683e8c1641 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106269 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--vcl/source/app/salvtables.cxx10
1 files changed, 10 insertions, 0 deletions
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index e866997880b8..38c91df612bf 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -5839,6 +5839,16 @@ public:
virtual void set_expanded(bool bExpand) override { m_xExpander->set_expanded(bExpand); }
+ virtual bool has_focus() const override
+ {
+ return m_xExpander->get_label_widget()->HasFocus() || SalInstanceContainer::has_focus();
+ }
+
+ virtual void grab_focus() override
+ {
+ return m_xExpander->get_label_widget()->GrabFocus();
+ }
+
virtual ~SalInstanceExpander() override
{
m_xExpander->SetExpandedHdl(Link<VclExpander&, void>());