aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Kudryavtsev <a.kudryavtsev@netris.ru>2016-03-29 14:25:57 +0300
committerAnton Kudryavtsev <a.kudryavtsev@netris.ru>2016-03-29 13:21:16 +0000
commitefd47f6ae97bcf26cef9d9404d12ce7a1b56031f (patch)
tree842e85e056e1667c9302eec9567b2d2c3dacd38b
parent193d11d7482e51215a0240e8a803915d6d400c66 (diff)
Dial: deduplicate binding.
Don't evaluate condition twice. Just use result of width. Change-Id: I38152353e7a2a5f60430684d38eb61140075d56f Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
-rw-r--r--src/imports/controls/Dial.qml2
-rw-r--r--src/imports/controls/material/Dial.qml2
-rw-r--r--src/imports/controls/universal/Dial.qml2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/imports/controls/Dial.qml b/src/imports/controls/Dial.qml
index b6752d55..a0f77ba9 100644
--- a/src/imports/controls/Dial.qml
+++ b/src/imports/controls/Dial.qml
@@ -48,7 +48,7 @@ T.Dial {
x: control.width / 2 - width / 2
y: control.height / 2 - height / 2
width: Math.max(64, Math.min(control.width, control.height))
- height: Math.max(64, Math.min(control.width, control.height))
+ height: width
radius: width / 2
border.color: "#353637"
}
diff --git a/src/imports/controls/material/Dial.qml b/src/imports/controls/material/Dial.qml
index a05982cc..0d4cac26 100644
--- a/src/imports/controls/material/Dial.qml
+++ b/src/imports/controls/material/Dial.qml
@@ -49,7 +49,7 @@ T.Dial {
x: control.width / 2 - width / 2
y: control.height / 2 - height / 2
width: Math.max(64, Math.min(control.width, control.height))
- height: Math.max(64, Math.min(control.width, control.height))
+ height: width
color: "transparent"
radius: width / 2
diff --git a/src/imports/controls/universal/Dial.qml b/src/imports/controls/universal/Dial.qml
index 9db1f8a5..232a2f5c 100644
--- a/src/imports/controls/universal/Dial.qml
+++ b/src/imports/controls/universal/Dial.qml
@@ -49,7 +49,7 @@ T.Dial {
x: control.width / 2 - width / 2
y: control.height / 2 - height / 2
width: Math.max(64, Math.min(control.width, control.height))
- height: Math.max(64, Math.min(control.width, control.height))
+ height: width
radius: width / 2
color: "transparent"
border.color: !control.enabled ? control.Universal.baseLowColor : control.Universal.baseMediumColor