diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-04-19 11:49:52 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-04-19 11:58:01 +0000 |
| commit | fd7bd4ec5116fd543ad21a6a63969f08deac4925 (patch) | |
| tree | f290c45595129c2c18370866c5c29c361f788368 /src/imports/controls | |
| parent | 06071fd14d6cff4d3f9b3cdff92f5ddf4bf2b3bc (diff) | |
Dial: follow the "standard" implicit size calculation practices
Change-Id: I9a08ebd646a720707ed70180b68942be378265b9
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls')
| -rw-r--r-- | src/imports/controls/Dial.qml | 10 | ||||
| -rw-r--r-- | src/imports/controls/fusion/Dial.qml | 8 | ||||
| -rw-r--r-- | src/imports/controls/material/Dial.qml | 9 | ||||
| -rw-r--r-- | src/imports/controls/universal/Dial.qml | 9 |
4 files changed, 26 insertions, 10 deletions
diff --git a/src/imports/controls/Dial.qml b/src/imports/controls/Dial.qml index be029c37..5ccd11f2 100644 --- a/src/imports/controls/Dial.qml +++ b/src/imports/controls/Dial.qml @@ -42,12 +42,14 @@ import QtQuick.Templates 2.5 as T T.Dial { id: control - implicitWidth: 184 - implicitHeight: 184 + implicitWidth: Math.max(implicitBackgroundWidth, + implicitContentWidth + leftPadding + rightPadding) || 184 // ### remove 184 in Qt 6 + implicitHeight: Math.max(implicitBackgroundHeight, + implicitContentHeight + topPadding + bottomPadding) || 184 // ### remove 184 in Qt 6 background: DialImpl { - width: control.availableWidth - height: control.availableHeight + implicitWidth: 184 + implicitHeight: 184 color: control.visualFocus ? control.palette.highlight : control.palette.dark progress: control.position opacity: control.enabled ? 1 : 0.3 diff --git a/src/imports/controls/fusion/Dial.qml b/src/imports/controls/fusion/Dial.qml index 3f353275..cf619164 100644 --- a/src/imports/controls/fusion/Dial.qml +++ b/src/imports/controls/fusion/Dial.qml @@ -44,10 +44,14 @@ import QtQuick.Controls.Fusion.impl 2.5 T.Dial { id: control - implicitWidth: 100 - implicitHeight: 100 + implicitWidth: Math.max(implicitBackgroundWidth, + implicitContentWidth + leftPadding + rightPadding) || 100 // ### remove 100 in Qt 6 + implicitHeight: Math.max(implicitBackgroundHeight, + implicitContentHeight + topPadding + bottomPadding) || 100 // ### remove 100 in Qt 6 background: DialImpl { + implicitWidth: 100 + implicitHeight: 100 palette: control.palette highlight: control.visualFocus } diff --git a/src/imports/controls/material/Dial.qml b/src/imports/controls/material/Dial.qml index f4d49175..1d2c7914 100644 --- a/src/imports/controls/material/Dial.qml +++ b/src/imports/controls/material/Dial.qml @@ -42,10 +42,15 @@ import QtQuick.Controls.Material.impl 2.5 T.Dial { id: control - implicitWidth: 100 - implicitHeight: 100 + implicitWidth: Math.max(implicitBackgroundWidth, + implicitContentWidth + leftPadding + rightPadding) || 100 // ### remove 100 in Qt 6 + implicitHeight: Math.max(implicitBackgroundHeight, + implicitContentHeight + topPadding + bottomPadding) || 100 // ### remove 100 in Qt 6 background: Rectangle { + implicitWidth: 100 + implicitHeight: 100 + x: control.width / 2 - width / 2 y: control.height / 2 - height / 2 width: Math.max(64, Math.min(control.width, control.height)) diff --git a/src/imports/controls/universal/Dial.qml b/src/imports/controls/universal/Dial.qml index ffeee7c1..118bb38b 100644 --- a/src/imports/controls/universal/Dial.qml +++ b/src/imports/controls/universal/Dial.qml @@ -41,10 +41,15 @@ import QtQuick.Controls.Universal 2.5 T.Dial { id: control - implicitWidth: 100 - implicitHeight: 100 + implicitWidth: Math.max(implicitBackgroundWidth, + implicitContentWidth + leftPadding + rightPadding) || 100 // ### remove 100 in Qt 6 + implicitHeight: Math.max(implicitBackgroundHeight, + implicitContentHeight + topPadding + bottomPadding) || 100 // ### remove 100 in Qt 6 background: Rectangle { + implicitWidth: 100 + implicitHeight: 100 + x: control.width / 2 - width / 2 y: control.height / 2 - height / 2 width: Math.max(64, Math.min(control.width, control.height)) |