[vlc-commits] [Git][videolan/vlc][master] 3 commits: qml: fix pinned controlbar becoming invisible

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
21102d36 by Pierre Lamot at 2024-12-15T09:53:19+00:00
qml: fix pinned controlbar becoming invisible

fix: #28810

- - - - -
85b73912 by Pierre Lamot at 2024-12-15T09:53:19+00:00
qml: fix mouse not disappearing with pinned controls

when controls are pinned, they are not supposed to become hidden, so we
shouldn't rely on their visible state

- - - - -
0409b922 by Pierre Lamot at 2024-12-15T09:53:19+00:00
qml: playlist button highlights the actual visibility in Player view

fix: #28809

- - - - -


2 changed files:

- modules/gui/qt/player/qml/Player.qml
- modules/gui/qt/player/qml/TopBar.qml


Changes:

=====================================
modules/gui/qt/player/qml/Player.qml
=====================================
@@ -210,9 +210,9 @@ FocusScope {
                     }
 
                     Binding on cursorShape {
-                        when: topBar.state === "hidden"
-                              && controlBar.state === "hidden"
-                              && !interactiveAutoHideTimer.running
+                        when: playerToolbarVisibilityFSM.started
+                            && !playerToolbarVisibilityFSM.isVisible
+                            && !interactiveAutoHideTimer.running
                         value: Qt.BlankCursor
                     }
                 }
@@ -548,6 +548,7 @@ FocusScope {
 
         showCSD: MainCtx.clientSideDecoration && (MainCtx.intfMainWindow.visibility !== Window.FullScreen)
         showToolbar: MainCtx.hasToolbarMenu && (MainCtx.intfMainWindow.visibility !== Window.FullScreen)
+        playlistVisible: playlistVisibility.isPlaylistVisible
 
         Navigation.parentItem: rootPlayer
         Navigation.downItem: {
@@ -563,7 +564,7 @@ FocusScope {
         //initial state value is "", using a binding avoid animation on startup
         Binding on state {
             when: playerToolbarVisibilityFSM.started
-            value: playerToolbarVisibilityFSM.isVisible ? "visible" : "hidden"
+            value: (playerToolbarVisibilityFSM.isVisible || rootPlayer._controlsUnderVideo) ? "visible" : "hidden"
         }
 
         onTogglePlaylistVisibility: playlistVisibility.togglePlaylistVisibility()
@@ -835,7 +836,7 @@ FocusScope {
         //initial state value is "", using a binding avoid animation on startup
         Binding on state {
             when: playerToolbarVisibilityFSM.started
-            value: playerToolbarVisibilityFSM.isVisible ? "visible" : "hidden"
+            value: (playerToolbarVisibilityFSM.isVisible || rootPlayer._controlsUnderVideo) ? "visible" : "hidden"
         }
 
         onRequestLockUnlockAutoHide: (lock) => rootPlayer.lockUnlockAutoHide(lock)


=====================================
modules/gui/qt/player/qml/TopBar.qml
=====================================
@@ -64,6 +64,8 @@ FocusScope{
 
     property alias resumeVisible: resumeDialog.visible
 
+    property alias playlistVisible: playlistButton.checked
+
     // Signals
 
     signal togglePlaylistVisibility()
@@ -470,8 +472,6 @@ FocusScope{
             description: qsTr("Playlist")
             focus: root.showToolbar
 
-            checked: MainCtx.playlistVisible
-
             width: VLCStyle.bannerButton_width
             height: VLCStyle.bannerButton_height
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/12f3980da15427873eaad4e6ac5d1736ba79c680...0409b9223a8aa6c3f1a5cae82888c8f2fbb08f28

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/12f3980da15427873eaad4e6ac5d1736ba79c680...0409b9223a8aa6c3f1a5cae82888c8f2fbb08f28
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance