[controls] scalability fixes5.10

improve scaling, add support for scalable images as well

this should cover all our controls except ListItem*

Change-Id: I050d65230dc15427b7066a156f362a48b3e1a929
Reviewed-by: Daniel d'Andrada <daniel.dandrada@luxoft.com>
Reviewed-by: Bramastyo Harimukti Santoso <bramastyo.harimukti.santoso@pelagicore.com>

3 files changed, 26 insertions, 26 deletions

diff --git a/styles/neptune/ItemDelegate.qml b/styles/neptune/ItemDelegate.qml
index 2fe0295e..7d7e0f31 100644
--- a/styles/neptune/ItemDelegate.qml
+++ b/styles/neptune/ItemDelegate.qml
@@ -45,17 +45,19 @@ T.ItemDelegate {
                                       indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)
     baselineOffset: contentItem.y + contentItem.baselineOffset
 
-    spacing: 12
-    padding: 12
+    spacing: NeptuneStyle.dp(12)
+    padding: NeptuneStyle.dp(12)
 
-    topPadding: padding - 1
-    bottomPadding: padding + 1
+    topPadding: padding - NeptuneStyle.dp(1)
+    bottomPadding: padding + NeptuneStyle.dp(1)
 
     font.pixelSize: NeptuneStyle.fontSizeM
     font.family: NeptuneStyle.fontFamily
     font.weight: Font.Light
 
-    contentItem: IconLabel {
+    contentItem: NeptuneIconLabel {
+        iconScale: NeptuneStyle.scale
+
         leftPadding: !control.mirrored ? (control.indicator ? control.indicator.width + control.spacing : 0) : 0
         rightPadding: control.mirrored ? (control.indicator ? control.indicator.width + control.spacing : 0) : 0
 
diff --git a/styles/neptune/ProgressBar.qml b/styles/neptune/ProgressBar.qml
index 42bba0d1..82eabb83 100644
--- a/styles/neptune/ProgressBar.qml
+++ b/styles/neptune/ProgressBar.qml
@@ -45,8 +45,8 @@ T.ProgressBar {
                              contentItem.implicitHeight + topPadding + bottomPadding)
 
     contentItem: ProgressBarImpl {
-        implicitHeight: 6
-        implicitWidth: 116
+        implicitHeight: NeptuneStyle.dp(6)
+        implicitWidth: NeptuneStyle.dp(116)
         scale: control.mirrored ? -1 : 1
         progress: control.position
         indeterminate: control.visible && control.indeterminate
@@ -54,9 +54,9 @@ T.ProgressBar {
     }
 
     background: Item {
-        implicitWidth: 200
-        implicitHeight: 6
+        implicitWidth: NeptuneStyle.dp(200)
+        implicitHeight: NeptuneStyle.dp(6)
         y: (control.height - height) / 2
-        height: 6
+        height: NeptuneStyle.dp(6)
     }
 }
diff --git a/styles/neptune/SwitchDelegate.qml b/styles/neptune/SwitchDelegate.qml
index e02ceadb..8dca66c6 100644
--- a/styles/neptune/SwitchDelegate.qml
+++ b/styles/neptune/SwitchDelegate.qml
@@ -50,41 +50,37 @@ T.SwitchDelegate {
                                       indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)
     baselineOffset: contentItem.y + contentItem.baselineOffset
 
-    padding: 12
-    spacing: 12
+    padding: NeptuneStyle.dp(12)
+    spacing: NeptuneStyle.dp(12)
 
     font.pixelSize: NeptuneStyle.fontSizeM
     font.family: NeptuneStyle.fontFamily
     font.weight: Font.Light
 
-    icon.width: 24
-    icon.height: 24
-    icon.color: control.palette.text
-
     indicator: PaddedRectangle {
-        implicitWidth: 56
-        implicitHeight: 32
+        implicitWidth: NeptuneStyle.dp(56)
+        implicitHeight: NeptuneStyle.dp(32)
 
         x: text ? (control.mirrored ? control.leftPadding : control.width - width - control.rightPadding) : control.leftPadding + (control.availableWidth - width) / 2
         y: control.topPadding + (control.availableHeight - height) / 2
 
-        radius: 16
+        radius: NeptuneStyle.dp(16)
         leftPadding: 0
         rightPadding: 0
-        padding: (height - 32) / 2
+        padding: (height - NeptuneStyle.dp(32)) / 2
         color: 'transparent'
-        border.width: control.visualFocus ? 2 : 1.4
+        border.width: control.visualFocus ? NeptuneStyle.dp(2) : NeptuneStyle.dp(1.4)
         border.color: control.checked ? control.NeptuneStyle.accentColor : control.NeptuneStyle.primaryTextColor
         opacity: enabled ? NeptuneStyle.fontOpacityHigh : NeptuneStyle.fontOpacityDisabled
 
         Rectangle {
             x: Math.max(0, Math.min(parent.width - width, control.visualPosition * parent.width - (width / 2)))
             y: (parent.height - height) / 2
-            width: 28
-            height: 28
-            radius: 16
+            width: NeptuneStyle.dp(28)
+            height: NeptuneStyle.dp(28)
+            radius: NeptuneStyle.dp(16)
             color: control.checked ? control.NeptuneStyle.accentColor : control.NeptuneStyle.primaryTextColor
-            border.width: control.visualFocus ? 2 : 1
+            border.width: control.visualFocus ? NeptuneStyle.dp(2) : NeptuneStyle.dp(1)
             border.color: control.visualFocus ? control.palette.highlight : control.enabled ? control.palette.mid : control.palette.midlight
 
             Behavior on x {
@@ -94,7 +90,9 @@ T.SwitchDelegate {
         }
     }
 
-    contentItem: IconLabel {
+    contentItem: NeptuneIconLabel {
+        iconScale: NeptuneStyle.scale
+
         leftPadding: control.mirrored ? control.indicator.width + control.spacing : 0
         rightPadding: !control.mirrored ? control.indicator.width + control.spacing : 0