[vlc-commits] qml: fix scaling factor of player controler widgets

[Pierre Lamot]

vlc | branch: master | Pierre Lamot <pierre at videolabs.io> | Tue Jun 18 16:08:49 2019 +0200| [ef9f14e13d3268e1bf0f257c1951cbd52571ff0c] | committer: Jean-Baptiste Kempf

qml: fix scaling factor of player controler widgets

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

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

 modules/gui/qt/qml/player/ControlButtons.qml |  4 ++--
 modules/gui/qt/qml/player/VolumeWidget.qml   | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/gui/qt/qml/player/ControlButtons.qml b/modules/gui/qt/qml/player/ControlButtons.qml
index a293d8d386..eb5617025a 100644
--- a/modules/gui/qt/qml/player/ControlButtons.qml
+++ b/modules/gui/qt/qml/player/ControlButtons.qml
@@ -196,7 +196,7 @@ Item{
         Item {
             objectName: "space"
             id: spacer
-            implicitWidth: 32 * scale
+            implicitWidth: 32 * VLCStyle.scale
             property bool acceptFocus: false
         }
     }
@@ -206,7 +206,7 @@ Item{
         Item{
             objectName: "extendedspace"
             id: extendedspacer
-            implicitWidth: 128 * scale
+            implicitWidth: 128 * VLCStyle.scale
             property bool acceptFocus: false
             Component.onCompleted: {
                 parent.Layout.fillWidth=true
diff --git a/modules/gui/qt/qml/player/VolumeWidget.qml b/modules/gui/qt/qml/player/VolumeWidget.qml
index afc06a080f..4ba213e5f1 100644
--- a/modules/gui/qt/qml/player/VolumeWidget.qml
+++ b/modules/gui/qt/qml/player/VolumeWidget.qml
@@ -53,10 +53,10 @@ FocusScope{
         Slider
         {
             id: volControl
-            width: 100 * scale
+            width: 100 * VLCStyle.scale
             height: parent.height
 
-            anchors.margins: 5 * scale
+            anchors.margins: 5 * VLCStyle.scale
             from: 0
             to: maxvolpos
             stepSize: 0.05
@@ -84,8 +84,8 @@ FocusScope{
                 x: volControl.leftPadding
                 y: volControl.topPadding + volControl.availableHeight / 2 - height / 2
                 implicitWidth: parent.width
-                implicitHeight: 4 * scale
-                radius: 4 * scale
+                implicitHeight: 4 * VLCStyle.scale
+                radius: 4 * VLCStyle.scale
                 color: VLCStyle.colors.volsliderbg
 
                 MouseArea {
@@ -116,7 +116,7 @@ FocusScope{
                     id: filled
                     width: volControl.visualPosition * parent.width
                     height: parent.height
-                    radius: 4 * scale
+                    radius: 4 * VLCStyle.scale
                     color: VLCStyle.colors.buttonText
                     layer.enabled: (volControl.hovered || volControl.activeFocus)
                     layer.effect: LinearGradient {
@@ -133,9 +133,9 @@ FocusScope{
                 Rectangle{
                     id: tickmark
                     x : parent.width * volControl.fullvolpos
-                    width: 1 * scale
+                    width: 1 * VLCStyle.scale
                     height: parent.height
-                    radius: 2 * scale
+                    radius: 2 * VLCStyle.scale
                     color: VLCStyle.colors.buttonText
                 }
             }
@@ -144,7 +144,7 @@ FocusScope{
                 x: volControl.leftPadding + volControl.visualPosition * (volControl.availableWidth - width)
                 y: volControl.topPadding + volControl.availableHeight / 2 - height / 2
 
-                implicitWidth: 8 * scale
+                implicitWidth: 8 * VLCStyle.scale
                 implicitHeight: implicitWidth
                 radius: width * 0.5
                 visible: (volControl.hovered || volControl.activeFocus)