[Libreoffice-commits] core.git: vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/app/salvtables.cxx |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit 3e15955877eafc86654bd90cbb0db926cd30ed4f
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Nov 20 10:16:07 2020 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Nov 20 21:06:51 2020 +0100

    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 at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

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>());