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

[Jan-Marek Glogowski (via logerrit)]

 vcl/qt5/Qt5Frame.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 96d428463ac6994586259fdc245e61a431937a72
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Sat Jul 25 23:24:56 2020 +0200
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Mon Jul 27 08:11:12 2020 +0200

    tdf#135077 Qt5 revert broken fix for tdf#132172
    
    So I tested a lot of stuff, but missed the missing focus for new
    dialog windows :-( This is IMHO a far worse problem, then the
    popup, so just revert the fix.
    
    This reverts commit 14eccc62b53e202cd9ed63442481922a320fc02e.
    
    Change-Id: I391ad91ded90e4518ab024572d3f182769b0bcda
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99454
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>
    Tested-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index 25be0a1a4bc9..b38b92f143c9 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -758,8 +758,7 @@ void Qt5Frame::ToTop(SalFrameToTop nFlags)
         pWidget->raise();
     if ((nFlags & SalFrameToTop::RestoreWhenMin) || (nFlags & SalFrameToTop::ForegroundTask))
         pWidget->activateWindow();
-    else if ((nFlags & (SalFrameToTop::GrabFocus | SalFrameToTop::GrabFocusOnly))
-             && pWidget->isVisible())
+    else if ((nFlags & SalFrameToTop::GrabFocus) || (nFlags & SalFrameToTop::GrabFocusOnly))
     {
         pWidget->activateWindow();
         pWidget->setFocus();