[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - vcl/qt5

[Jan-Marek Glogowski (via logerrit)]

 vcl/qt5/Qt5Frame.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 0a8b2979b7639af4b652f434c20ede7155ab5ec2
Author:     Jan-Marek Glogowski <jan-marek.glogowski at extern.cib.de>
AuthorDate: Mon Nov 25 14:08:44 2019 +0000
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Wed Nov 27 15:03:55 2019 +0100

    tdf#126607 Qt5 activate window before setFocus
    
    .., and prevent Qt5MainWindow to take any focus.
    
    Our top level Qt5MainWindow shouldn't handle focus directly, as
    it's always completely drawn by the child Qt5Widget, which also
    handles input. So prevent any direct focus handling by setting
    the Qt5Widget as the focus proxy of the Qt5MainWindow.
    
    Also setting the focus of the child widget on its own seems to
    do nothing at all. At least I didn't see any difference after
    commenting the code block. But it at least has some effect, if
    you call setFocus on the real window, but that breaks Impress
    full screen mode, which somehow gets scroll bars?!
    
    Not that I understand why this is needed. At least the original
    X11 code just calls XSetInputFocus in this case.
    
    Change-Id: I591c031a17a7ae0b5486760cd1802522d4088678
    Reviewed-on: https://gerrit.libreoffice.org/83689
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>
    (cherry picked from commit ec554ac30236fa7949e9866d01319d4e3e88c983)
    Reviewed-on: https://gerrit.libreoffice.org/83895
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index 9b86ee7ed9c8..f2d1be4a279f 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -153,6 +153,7 @@ Qt5Frame::Qt5Frame(Qt5Frame* pParent, SalFrameStyleFlags nStyle, bool bUseCairo)
         m_pTopLevel = new Qt5MainWindow(*this, pParentWidget, aWinFlags);
         m_pQWidget = new Qt5Widget(*this, aWinFlags);
         m_pTopLevel->setCentralWidget(m_pQWidget);
+        m_pTopLevel->setFocusProxy(m_pQWidget);
     }
     else
         m_pQWidget = new Qt5Widget(*this, aWinFlags);
@@ -686,7 +687,10 @@ void Qt5Frame::ToTop(SalFrameToTop nFlags)
     if ((nFlags & SalFrameToTop::RestoreWhenMin) || (nFlags & SalFrameToTop::ForegroundTask))
         pWidget->activateWindow();
     else if ((nFlags & SalFrameToTop::GrabFocus) || (nFlags & SalFrameToTop::GrabFocusOnly))
-        m_pQWidget->setFocus();
+    {
+        pWidget->activateWindow();
+        pWidget->setFocus();
+    }
 }
 
 void Qt5Frame::SetPointer(PointerStyle ePointerStyle)