diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2020-04-22 16:26:57 +0200 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2020-05-13 09:46:07 +0200 |
| commit | 5e46b5bb617b5e15cebc4033bfd0ae9ab2248aba (patch) | |
| tree | d0ff186bea6dbdb776fc8fb245394f8f18ac7ee4 /src/imports/controls | |
| parent | 5b376af5065bf756a1a08f33a551cc187d4de937 (diff) | |
Dial: remove unnecessary id qualifications
This amends 467aa59a8.
Pick-to: 5.15
Change-Id: If162e6fe6f3087e905457d23248e95ae31726e4d
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/imports/controls')
| -rw-r--r-- | src/imports/controls/Dial.qml | 4 | ||||
| -rw-r--r-- | src/imports/controls/fusion/Dial.qml | 4 | ||||
| -rw-r--r-- | src/imports/controls/imagine/Dial.qml | 4 | ||||
| -rw-r--r-- | src/imports/controls/material/Dial.qml | 4 | ||||
| -rw-r--r-- | src/imports/controls/universal/Dial.qml | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/src/imports/controls/Dial.qml b/src/imports/controls/Dial.qml index 2fed1bca..e7c732cd 100644 --- a/src/imports/controls/Dial.qml +++ b/src/imports/controls/Dial.qml @@ -56,8 +56,8 @@ T.Dial { } handle: ColorImage { - x: control.background.x + control.background.width / 2 - control.handle.width / 2 - y: control.background.y + control.background.height / 2 - control.handle.height / 2 + x: control.background.x + control.background.width / 2 - width / 2 + y: control.background.y + control.background.height / 2 - height / 2 width: 14 height: 10 defaultColor: "#353637" diff --git a/src/imports/controls/fusion/Dial.qml b/src/imports/controls/fusion/Dial.qml index bf8021e5..3c22c66a 100644 --- a/src/imports/controls/fusion/Dial.qml +++ b/src/imports/controls/fusion/Dial.qml @@ -56,8 +56,8 @@ T.Dial { } handle: KnobImpl { - x: control.background.x + control.background.width / 2 - control.handle.width / 2 - y: control.background.y + control.background.height / 2 - control.handle.height / 2 + x: control.background.x + control.background.width / 2 - width / 2 + y: control.background.y + control.background.height / 2 - height / 2 width: control.width / 7 height: control.height / 7 transform: [ diff --git a/src/imports/controls/imagine/Dial.qml b/src/imports/controls/imagine/Dial.qml index f8c394f3..83daf14a 100644 --- a/src/imports/controls/imagine/Dial.qml +++ b/src/imports/controls/imagine/Dial.qml @@ -58,8 +58,8 @@ T.Dial { bottomInset: background ? -background.bottomInset || 0 : 0 handle: Image { - x: background.x + background.width / 2 - handle.width / 2 - y: background.y + background.height / 2 - handle.height / 2 + x: background.x + background.width / 2 - width / 2 + y: background.y + background.height / 2 - height / 2 source: Imagine.url + "dial-handle" ImageSelector on source { diff --git a/src/imports/controls/material/Dial.qml b/src/imports/controls/material/Dial.qml index 706261fc..1ad9a0ce 100644 --- a/src/imports/controls/material/Dial.qml +++ b/src/imports/controls/material/Dial.qml @@ -62,8 +62,8 @@ T.Dial { } handle: SliderHandle { - x: control.background.x + control.background.width / 2 - control.handle.width / 2 - y: control.background.y + control.background.height / 2 - control.handle.height / 2 + x: control.background.x + control.background.width / 2 - width / 2 + y: control.background.y + control.background.height / 2 - height / 2 transform: [ Translate { y: -control.background.height * 0.4 + control.handle.height / 2 diff --git a/src/imports/controls/universal/Dial.qml b/src/imports/controls/universal/Dial.qml index 001c5a55..0d8fcba0 100644 --- a/src/imports/controls/universal/Dial.qml +++ b/src/imports/controls/universal/Dial.qml @@ -64,8 +64,8 @@ T.Dial { implicitWidth: 14 implicitHeight: 14 - x: control.background.x + control.background.width / 2 - control.handle.width / 2 - y: control.background.y + control.background.height / 2 - control.handle.height / 2 + x: control.background.x + control.background.width / 2 - width / 2 + y: control.background.y + control.background.height / 2 - height / 2 radius: width / 2 color: !control.enabled ? control.Universal.baseLowColor : |