[vlc-commits] [Git][videolan/vlc][master] qt: fix CSD preference option

[Hugo Beauzée-Luyssen (@chouquette)]

Hugo Beauzée-Luyssen pushed to branch master at VideoLAN / VLC


Commits:
b09ebf8a by Prince Gupta at 2021-10-29T12:20:14+00:00
qt: fix CSD preference option

fixup 9605326190a

- - - - -


2 changed files:

- modules/gui/qt/maininterface/main_interface.cpp
- modules/gui/qt/maininterface/main_interface.hpp


Changes:

=====================================
modules/gui/qt/maininterface/main_interface.cpp
=====================================
@@ -247,7 +247,7 @@ bool MainInterface::hasVLM() const {
 bool MainInterface::useClientSideDecoration() const
 {
     //don't show CSD when interface is fullscreen
-    return m_clientSideDecoration && m_windowVisibility != QWindow::FullScreen;
+    return !m_windowTitlebar && m_windowVisibility != QWindow::FullScreen;
 }
 
 bool MainInterface::hasFirstrun() const {
@@ -289,7 +289,7 @@ void MainInterface::loadPrefs(const bool callSignals)
     loadFromVLCOption(m_hasToolbarMenu, "qt-menubar", &MainInterface::hasToolbarMenuChanged);
 
 #if QT_CLIENT_SIDE_DECORATION_AVAILABLE
-    loadFromVLCOption(m_clientSideDecoration, "qt-titlebar" , &MainInterface::useClientSideDecorationChanged);
+    loadFromVLCOption(m_windowTitlebar, "qt-titlebar" , &MainInterface::useClientSideDecorationChanged);
 #endif
 }
 


=====================================
modules/gui/qt/maininterface/main_interface.hpp
=====================================
@@ -281,7 +281,7 @@ protected:
     MediaLib*            m_medialib = nullptr;
     bool                 m_gridView = false;
     ColorSchemeModel*    m_colorScheme = nullptr;
-    bool                 m_clientSideDecoration = false;
+    bool                 m_windowTitlebar = false;
     bool                 m_hasToolbarMenu = false;
     bool                 m_canShowVideoPIP = false;
     bool                 m_pinVideoControls = false;



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/b09ebf8a1c791c31be86dfc3aa62fd7586859cea

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/b09ebf8a1c791c31be86dfc3aa62fd7586859cea
You're receiving this email because of your account on code.videolan.org.