vcl/qt5/Qt5Frame.cxx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
New commits: commit cc00a017e526452ae69d98972cbd4ac09b2d81b1 Author: Jan-Marek Glogowski <[email protected]> AuthorDate: Sat Jul 25 23:35:33 2020 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Mon Jul 27 08:11:49 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 884cf2aef3a46c269243d6dbe08356ad831e956d. Change-Id: I391ad91ded90e4518ab024572d3f182769b0bcda Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99452 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <[email protected]> (cherry picked from commit 1f5125f9bfb6f871a1a21911e0ef0c284d1e1dc7) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99396 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Michael Weghorn <[email protected]> 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(); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
