[vlc-commits] [Git][videolan/vlc][master] qml: PlaylistListView padding and spacing adjustment

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
0e2f9376 by Fatih Uzunoglu at 2023-11-17T10:30:12+00:00
qml: PlaylistListView padding and spacing adjustment

- - - - -


3 changed files:

- modules/gui/qt/maininterface/qml/MainDisplay.qml
- modules/gui/qt/playlist/qml/PlaylistListView.qml
- modules/gui/qt/playlist/qml/PlaylistToolbar.qml


Changes:

=====================================
modules/gui/qt/maininterface/qml/MainDisplay.qml
=====================================
@@ -364,9 +364,8 @@ FocusScope {
                     focus: true
 
                     rightPadding: VLCStyle.applicationHorizontalMargin
-
-                    bottomPadding: topPadding + Math.max(VLCStyle.applicationVerticalMargin
-                                                         - g_mainDisplay.displayMargin, 0)
+                    topPadding: VLCStyle.margin_xlarge // NOTE: why the design mandates such large top padding?
+                    bottomPadding: VLCStyle.margin_normal + Math.max(VLCStyle.applicationVerticalMargin - g_mainDisplay.displayMargin, 0)
 
                     Navigation.parentItem: mainColumn
                     Navigation.upItem: sourcesBanner


=====================================
modules/gui/qt/playlist/qml/PlaylistListView.qml
=====================================
@@ -55,8 +55,7 @@ T.Pane {
     implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
                              contentHeight + topPadding + bottomPadding)
 
-    topPadding: VLCStyle.margin_normal
-    bottomPadding: VLCStyle.margin_normal
+    verticalPadding: VLCStyle.margin_normal
 
     Accessible.name: I18n.qtr("Playqueue")
 
@@ -144,7 +143,7 @@ T.Pane {
     }
 
     contentItem: ColumnLayout {
-        spacing: 0
+        spacing: VLCStyle.margin_xxsmall
 
         Layout.minimumWidth: noContentInfoColumn.implicitWidth
 
@@ -171,12 +170,16 @@ T.Pane {
             }
         }
 
+        Item {
+            // Spacer
+
+            implicitHeight: VLCStyle.margin_xsmall
+        }
+
         RowLayout {
             visible: model.count !== 0
 
             Layout.fillHeight: false
-            Layout.topMargin: VLCStyle.margin_normal
-            Layout.bottomMargin: VLCStyle.margin_xxsmall
             Layout.leftMargin: VLCStyle.margin_normal
             Layout.rightMargin: Math.max(listView.ScrollBar.vertical.width, VLCStyle.margin_normal)
 
@@ -513,8 +516,11 @@ T.Pane {
         PlaylistToolbar {
             id: toolbar
 
+            Layout.preferredHeight: VLCStyle.heightBar_normal
             Layout.fillHeight: false
             Layout.fillWidth: true
+            Layout.leftMargin: VLCStyle.margin_normal
+            Layout.rightMargin: VLCStyle.margin_normal
         }
     }
 


=====================================
modules/gui/qt/playlist/qml/PlaylistToolbar.qml
=====================================
@@ -32,14 +32,16 @@ RowLayout {
         colorSet: ColorContext.Window
     }
 
-    height: VLCStyle.heightBar_normal
     spacing: VLCStyle.margin_normal
 
     Accessible.role: Accessible.ToolBar
 
     Item {
         Layout.fillWidth: true
-        implicitHeight: loop.height
+        Layout.fillHeight: true
+
+        implicitWidth: loop.implicitWidth
+        implicitHeight: loop.implicitHeight
 
         Widgets.IconToolButton {
             id: loop
@@ -60,7 +62,10 @@ RowLayout {
 
     Item {
         Layout.fillWidth: true
-        implicitHeight: shuffle.height
+        Layout.fillHeight: true
+
+        implicitWidth: shuffle.implicitWidth
+        implicitHeight: shuffle.implicitHeight
 
         Widgets.IconToolButton {
             id: shuffle
@@ -78,7 +83,10 @@ RowLayout {
 
     Item {
         Layout.fillWidth: true
-        implicitHeight: sort.height
+        Layout.fillHeight: true
+
+        implicitWidth: sort.implicitWidth
+        implicitHeight: sort.implicitHeight
 
         Widgets.SortControl {
             id: sort
@@ -125,7 +133,10 @@ RowLayout {
 
     Item {
         Layout.fillWidth: true
-        implicitHeight: clear.height
+        Layout.fillHeight: true
+
+        implicitWidth: clear.implicitWidth
+        implicitHeight: clear.implicitHeight
 
         Widgets.IconToolButton {
             id: clear



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

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


VideoLAN code repository instance