diff options
author | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2016-01-04 13:43:11 +0100 |
---|---|---|
committer | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2016-01-04 13:39:28 +0000 |
commit | 528fecd8b8d0b7cd0d002c6da6a7d760a04f094a (patch) | |
tree | cc7fe7faf42949ce3b59b548762c2b10af8ce07d /src/imports/controls/Dial.qml | |
parent | 4024fab4cbfe5576429c20d1910306d392accf2b (diff) |
Make sure that Dial is always circular
Task-number: QTBUG-49958
Change-Id: Ifbb14987e503aaa59651e65a2b8cfd99f2907154
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/Dial.qml')
-rw-r--r-- | src/imports/controls/Dial.qml | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/imports/controls/Dial.qml b/src/imports/controls/Dial.qml index 9068464f..b6752d55 100644 --- a/src/imports/controls/Dial.qml +++ b/src/imports/controls/Dial.qml @@ -45,31 +45,27 @@ T.Dial { //! [background] background: Rectangle { + 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)) radius: width / 2 border.color: "#353637" - - Text { - text: control.position.toFixed(1) - color: "#353637" - font.pixelSize: 60 - x: parent.width / 2 - width / 2 - y: parent.height / 2 - height / 2 - } } //! [background] //! [handle] handle: Image { id: handleItem - x: background.width / 2 - handle.width / 2 - y: background.height / 2 - handle.height / 2 + x: background.x + background.width / 2 - handle.width / 2 + y: background.y + background.height / 2 - handle.height / 2 width: 14 height: 10 source: "qrc:/qt-project.org/imports/Qt/labs/controls/images/dial-indicator.png" antialiasing: true transform: [ Translate { - y: -background.height * 0.4 + y: -background.height * 0.4 + handle.height / 2 }, Rotation { angle: control.angle |