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

New commits:
commit a67f89078ec50239bf9dafbde67feab7e6ff035a
Author:     Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Sat Jul 25 23:31:32 2020 +0200
Commit:     Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Mon Jul 27 08:12:56 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 06fb3e7b7f1079c276ad2f048cd94299b4bd7006.
    
    Change-Id: I391ad91ded90e4518ab024572d3f182769b0bcda
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99451
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>

diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index 845b5860e713..ed3368ac3970 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -764,8 +764,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();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to