aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/fusion
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2018-04-19 11:49:52 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2018-04-19 11:58:01 +0000
commitfd7bd4ec5116fd543ad21a6a63969f08deac4925 (patch)
treef290c45595129c2c18370866c5c29c361f788368 /src/imports/controls/fusion
parent06071fd14d6cff4d3f9b3cdff92f5ddf4bf2b3bc (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/fusion')
-rw-r--r--src/imports/controls/fusion/Dial.qml8
1 files changed, 6 insertions, 2 deletions
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
}