diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-07-25 23:24:56 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2020-07-27 08:38:59 +0200 |
| commit | 842cacdb384b058a465b7b8abee813e19375edd5 (patch) | |
| tree | 10919d2e78f7887e190a08b56fa463d3ec6fee26 | |
| parent | fix tree disabled in autofilter pulldown, tdf#76481 related (diff) | |
| download | core-842cacdb384b058a465b7b8abee813e19375edd5.tar.gz core-842cacdb384b058a465b7b8abee813e19375edd5.zip | |
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/+/99453
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 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(); |