diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-07-25 23:35:33 +0200 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2020-07-26 15:46:11 +0200 |
| commit | 1f5125f9bfb6f871a1a21911e0ef0c284d1e1dc7 (patch) | |
| tree | 7b0105235537e660d4dd599937d8fb9b5fa07510 | |
| parent | 6c424878ec546565537a3db2f284a1d009dee24d (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>
| -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(); |