summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2020-07-25 23:24:56 +0200
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2020-07-26 15:45:38 +0200
commit3058a13921b2d3aad6e14d1cba9047b8d5bdf63d (patch)
tree68889dc6ceb2ff9303d37cf4821f2c79db303a2c /vcl
parent005ec5a368f4c6d4081efee483f9585a4db306d3 (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 14eccc62b53e202cd9ed63442481922a320fc02e. Change-Id: I391ad91ded90e4518ab024572d3f182769b0bcda Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99453 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/qt5/Qt5Frame.cxx3
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();