diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-10-31 13:41:20 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-10-31 21:03:39 +0100 |
| commit | e4abf879f4a24258bcc560eb58ca78b147768d46 (patch) | |
| tree | be29f1224abb69e6736f3ab904e11c6a07d7f7a0 | |
| parent | eafa99c6c4904bce9bf692eca97562af92cd633e (diff) | |
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 <glogow@fbihome.de>
| -rw-r--r-- | vcl/qt5/QtFrame.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
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 |