diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-07-25 23:35:33 +0200 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2020-07-27 08:11:49 +0200 |
| commit | cc00a017e526452ae69d98972cbd4ac09b2d81b1 (patch) | |
| tree | 297d8a31cf22ef18642f2d426e0829960070607f | |
| parent | d9e4e9a16cc2e83bc023d39644771bd7eee4abf1 (diff) | |
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 884cf2aef3a46c269243d6dbe08356ad831e956d.
Change-Id: I391ad91ded90e4518ab024572d3f182769b0bcda
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99452
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
(cherry picked from commit 1f5125f9bfb6f871a1a21911e0ef0c284d1e1dc7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99396
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Tested-by: Michael Weghorn <m.weghorn@posteo.de>
| -rw-r--r-- | vcl/qt5/Qt5Frame.cxx | 3 |
1 files changed, 1 insertions, 2 deletions
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(); |