[Libreoffice-commits] core.git: vcl/qt5

[Jan-Marek Glogowski (via logerrit)]

 vcl/qt5/QtFrame.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 373b27e7038cf4010a04163861ebec48984b4353
Author:     Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Wed Nov 10 12:18:39 2021 +0100
Commit:     Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Wed Nov 10 15:35:12 2021 +0100

    tdf#145508 Qt NONE-frames should still be windows
    
    This drops the newly "&& (nStyle != SalFrameStyleFlags::NONE))"
    introduced in the regressing commit
    e4abf879f4a24258bcc560eb58ca78b147768d46 ("tdf#145363 Qt popups
    actually are windows").
    
    A GtkBox based UI snippet, like vcl/uiconfig/ui/combobox.ui, IMHO
    shoulden't be represented as a Qt::Window, but a Qt::Widget. But
    there is no real way to identify it, so lets keep the old, working
    code.
    
    Change-Id: Ic41ff15ab651b422ee95c906cac67e37be8d8a65
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124958
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glo...@fbihome.de>

diff --git a/vcl/qt5/QtFrame.cxx b/vcl/qt5/QtFrame.cxx
index 1ae4016d589d..591e084edf38 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) && (nStyle != 
SalFrameStyleFlags::NONE))
+    if (!(nStyle & SalFrameStyleFlags::SYSTEMCHILD))
     {
         if (nStyle & SalFrameStyleFlags::INTRO)
             aWinFlags = Qt::SplashScreen;