vcl/qt5/QtFrame.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit e4abf879f4a24258bcc560eb58ca78b147768d46
Author: Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Sun Oct 31 13:41:20 2021 +0100
Commit: Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Sun Oct 31 21:03:39 2021 +0100
tdf#145363 Qt popups actually are windows
An other patch in the whole Qt popup handling saga. At this point
it mainly exists as a prerequisite for the real tdf#145363 fix. I
just wanted to keep it separate. Maybe it also helps Qt Wayland.
Change-Id: Ib76e9919398bdd5fa7d6239ddb126859f0c0edbf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124525
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glo...@fbihome.de>
diff --git a/vcl/qt5/QtFrame.cxx b/vcl/qt5/QtFrame.cxx
index 1fc9930ae83f..73bdad874552 100644
--- a/vcl/qt5/QtFrame.cxx
+++ b/vcl/qt5/QtFrame.cxx
@@ -138,7 +138,7 @@ QtFrame::QtFrame(QtFrame* pParent, SalFrameStyleFlags
nStyle, bool bUseCairo)
m_pParent = pParent;
Qt::WindowFlags aWinFlags(Qt::Widget);
- if (!(nStyle & SalFrameStyleFlags::SYSTEMCHILD))
+ if (!(nStyle & SalFrameStyleFlags::SYSTEMCHILD) && (nStyle !=
SalFrameStyleFlags::NONE))
{
if (nStyle & SalFrameStyleFlags::INTRO)
aWinFlags = Qt::SplashScreen;
@@ -153,7 +153,7 @@ QtFrame::QtFrame(QtFrame* pParent, SalFrameStyleFlags
nStyle, bool bUseCairo)
// a focus-out event, reaching the combo box. This used to map to
// Qt::ToolTip, which doesn't feel that correct...
else if (isPopup())
- aWinFlags = Qt::Widget | Qt::FramelessWindowHint |
Qt::BypassWindowManagerHint;
+ aWinFlags = Qt::Window | Qt::FramelessWindowHint |
Qt::BypassWindowManagerHint;
else if (nStyle & SalFrameStyleFlags::TOOLWINDOW)
aWinFlags = Qt::Tool;
// top level windows can't be transient in Qt, so make them dialogs,
if they have a parent. At least
