[Libreoffice-commits] core.git: vcl/qt5
Jan-Marek Glogowski (via logerrit)
logerrit at kemper.freedesktop.org
Mon Jul 27 06:13:34 UTC 2020
vcl/qt5/Qt5Frame.cxx | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit a67f89078ec50239bf9dafbde67feab7e6ff035a
Author: Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Sat Jul 25 23:31:32 2020 +0200
Commit: Michael Weghorn <m.weghorn at 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.weghorn at 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();
More information about the Libreoffice-commits
mailing list