[vlc-commits] [Git][videolan/vlc][master] 2 commits: qml: remove obsolete property

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
8dc55aa5 by Prince Gupta at 2023-10-06T14:23:47+00:00
qml: remove obsolete property

fixes keyboard down navigation

- - - - -
2d783ce5 by Prince Gupta at 2023-10-06T14:23:47+00:00
qml: simplify code

- - - - -


1 changed file:

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


Changes:

=====================================
modules/gui/qt/player/qml/Player.qml
=====================================
@@ -339,10 +339,15 @@ FocusScope {
             showToolbar: MainCtx.hasToolbarMenu && (MainCtx.intfMainWindow.visibility !== Window.FullScreen)
 
             Navigation.parentItem: rootPlayer
-            Navigation.downItem: playlistpopup.showPlaylist ?
-                                     playlistpopup : (audioControls.visible ?
-                                                          audioControls : (Player.isInteractive ?
-                                                                               toggleControlBarButton : controlBarView))
+            Navigation.downItem: {
+                if (playlistVisibility.isPlaylistVisible)
+                    return playlistpopup
+                if (audioControls.visible)
+                    return audioControls
+                if (Player.isInteractive)
+                    return toggleControlBarButton
+                return controlBarView
+            }
 
             onTogglePlaylistVisibility: playlistVisibility.togglePlaylistVisibility()
 
@@ -565,8 +570,6 @@ FocusScope {
     Widgets.DrawerExt {
         id: playlistpopup
 
-        property bool showPlaylist: false
-
         anchors {
             // NOTE: When the controls are pinned we display the playqueue under the topBar.
             top: (rootPlayer._controlsUnderVideo) ? topcontrolView.bottom
@@ -715,7 +718,7 @@ FocusScope {
         iconTxt: controlBarView.state === "hidden" ? VLCIcons.expand_inverted : VLCIcons.expand
 
         Navigation.parentItem: rootPlayer
-        Navigation.upItem: playlistpopup.showPlaylist ? playlistpopup : (audioControls.visible ? audioControls : topcontrolView)
+        Navigation.upItem: playlistVisibility.isPlaylistVisible ? playlistpopup : (audioControls.visible ? audioControls : topcontrolView)
         Navigation.downItem: controlBarView
 
         onClicked: {
@@ -755,10 +758,15 @@ FocusScope {
                           : ControlBar.TimeTextPosition.AboveSlider
 
             Navigation.parentItem: rootPlayer
-            Navigation.upItem: playlistpopup.showPlaylist ?
-                                   playlistpopup : (Player.isInteractive ?
-                                                        toggleControlBarButton : (audioControls.visible ?
-                                                                                      audioControls : topcontrolView))
+            Navigation.upItem: {
+                if (playlistVisibility.isPlaylistVisible)
+                    return playlistpopup
+                if (Player.isInteractive)
+                    return toggleControlBarButton
+                if (audioControls.visible)
+                    return audioControls
+                return topcontrolView
+            }
 
             onRequestLockUnlockAutoHide: rootPlayer.lockUnlockAutoHide(lock)
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/f912530730b714e7122cd0002fcac11deb872594...2d783ce5dde7b9d343cee5e251056c0757e11f52

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/f912530730b714e7122cd0002fcac11deb872594...2d783ce5dde7b9d343cee5e251056c0757e11f52
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance