[vlc-commits] qml: provide visuals for spacer widgets in paint only mode

[Rohan Rajpal]

vlc | branch: master | Rohan Rajpal <rohan17089 at iiitd.ac.in> | Tue Jul 30 12:55:55 2019 +0530| [0656b3b6c4a820b38cb54ca127d869c79196154f] | committer: Jean-Baptiste Kempf

qml: provide visuals for spacer widgets in paint only mode

Modify space and extended space to display space icon
in the editor.

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0656b3b6c4a820b38cb54ca127d869c79196154f
---

 modules/gui/qt/qml/player/ControlButtons.qml | 38 ++++++++++++++++++++++++++--
 modules/gui/qt/qml/style/VLCStyle.qml        |  1 +
 2 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/modules/gui/qt/qml/player/ControlButtons.qml b/modules/gui/qt/qml/player/ControlButtons.qml
index e0bcac67ea..2020da1fef 100644
--- a/modules/gui/qt/qml/player/ControlButtons.qml
+++ b/modules/gui/qt/qml/player/ControlButtons.qml
@@ -190,7 +190,24 @@ Item{
         id:spacerDelegate
         Item {
             id: spacer
-            implicitWidth: 32 * VLCStyle.scale
+            implicitWidth: VLCStyle.icon_normal
+            implicitHeight: VLCStyle.icon_normal
+            property alias spacetextExt: spacetext
+            property bool paintOnly: false
+            Label {
+                id: spacetext
+                text: VLCIcons.space
+                color: VLCStyle.colors.buttonText
+                visible: parent.paintOnly
+
+                anchors.centerIn: parent
+
+                font.pixelSize: VLCStyle.icon_medium
+                font.family: VLCIcons.fontFamily
+
+                verticalAlignment: Text.AlignVCenter
+                horizontalAlignment: Text.AlignHCenter
+            }
             property bool acceptFocus: false
         }
     }
@@ -199,7 +216,24 @@ Item{
         id: extendiblespacerDelegate
         Item{
             id: extendedspacer
-            implicitWidth: 128 * VLCStyle.scale
+            implicitWidth: VLCStyle.widthExtendedSpacer
+            implicitHeight: VLCStyle.icon_normal
+            property bool paintOnly: false
+            property alias spacetextExt: spacetext
+            Label {
+                id: spacetext
+                text: VLCIcons.space
+                color: VLCStyle.colors.buttonText
+                visible: paintOnly
+
+                anchors.centerIn: parent
+
+                font.pixelSize: VLCStyle.icon_medium
+                font.family: VLCIcons.fontFamily
+
+                verticalAlignment: Text.AlignVCenter
+                horizontalAlignment: Text.AlignHCenter
+            }
             property bool acceptFocus: false
             Component.onCompleted: {
                 parent.Layout.fillWidth=true
diff --git a/modules/gui/qt/qml/style/VLCStyle.qml b/modules/gui/qt/qml/style/VLCStyle.qml
index f21edc5477..308a4c5dfd 100644
--- a/modules/gui/qt/qml/style/VLCStyle.qml
+++ b/modules/gui/qt/qml/style/VLCStyle.qml
@@ -99,6 +99,7 @@ Item {
     property int widthSearchInput: 200 * scale;
     property int widthSortBox: 150 * scale;
     property int widthTeletext: 280 * scale;
+    property int widthExtendedSpacer: 128 * scale;
     property int heightInput: 22 * scale;
 
     property int selectedBorder: 2