diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-04-19 12:00:52 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-04-19 11:58:06 +0000 |
| commit | 7a1d2e71d7aff9ab31e267e1e07280a39165640b (patch) | |
| tree | da555e855566b6a58700f2534f0bacd1f4bd4bad | |
| parent | 775d1b1630b67d308a44b6dad528e3330351b964 (diff) | |
BusyIndicator: follow the "standard" implicit size calculation practices
Even if the default implementation would not have a background, controls
should support custom backgrounds that provide an implicit size.
Change-Id: I9ceb929cb540b04719cf85343f23ce13d80ea97b
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| -rw-r--r-- | src/imports/controls/BusyIndicator.qml | 6 | ||||
| -rw-r--r-- | src/imports/controls/fusion/BusyIndicator.qml | 6 | ||||
| -rw-r--r-- | src/imports/controls/material/BusyIndicator.qml | 6 | ||||
| -rw-r--r-- | src/imports/controls/universal/BusyIndicator.qml | 6 |
4 files changed, 16 insertions, 8 deletions
diff --git a/src/imports/controls/BusyIndicator.qml b/src/imports/controls/BusyIndicator.qml index ced5aa7f..c03f6af4 100644 --- a/src/imports/controls/BusyIndicator.qml +++ b/src/imports/controls/BusyIndicator.qml @@ -42,8 +42,10 @@ import QtQuick.Templates 2.5 as T T.BusyIndicator { id: control - implicitWidth: implicitContentWidth + leftPadding + rightPadding - implicitHeight: implicitContentHeight + topPadding + bottomPadding + implicitWidth: Math.max(implicitBackgroundWidth, + implicitContentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(implicitBackgroundHeight, + implicitContentHeight + topPadding + bottomPadding) padding: 6 diff --git a/src/imports/controls/fusion/BusyIndicator.qml b/src/imports/controls/fusion/BusyIndicator.qml index 71d83080..8ddade47 100644 --- a/src/imports/controls/fusion/BusyIndicator.qml +++ b/src/imports/controls/fusion/BusyIndicator.qml @@ -44,8 +44,10 @@ import QtQuick.Controls.Fusion.impl 2.5 T.BusyIndicator { id: control - implicitWidth: implicitContentWidth + leftPadding + rightPadding - implicitHeight: implicitContentHeight + topPadding + bottomPadding + implicitWidth: Math.max(implicitBackgroundWidth, + implicitContentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(implicitBackgroundHeight, + implicitContentHeight + topPadding + bottomPadding) padding: 6 diff --git a/src/imports/controls/material/BusyIndicator.qml b/src/imports/controls/material/BusyIndicator.qml index 90261ac2..120fd64b 100644 --- a/src/imports/controls/material/BusyIndicator.qml +++ b/src/imports/controls/material/BusyIndicator.qml @@ -42,8 +42,10 @@ import QtQuick.Controls.Material.impl 2.5 T.BusyIndicator { id: control - implicitWidth: implicitContentWidth + leftPadding + rightPadding - implicitHeight: implicitContentHeight + topPadding + bottomPadding + implicitWidth: Math.max(implicitBackgroundWidth, + implicitContentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(implicitBackgroundHeight, + implicitContentHeight + topPadding + bottomPadding) padding: 6 diff --git a/src/imports/controls/universal/BusyIndicator.qml b/src/imports/controls/universal/BusyIndicator.qml index 8ecdbdec..0dccc647 100644 --- a/src/imports/controls/universal/BusyIndicator.qml +++ b/src/imports/controls/universal/BusyIndicator.qml @@ -42,8 +42,10 @@ import QtQuick.Controls.Universal.impl 2.5 T.BusyIndicator { id: control - implicitWidth: implicitContentWidth + leftPadding + rightPadding - implicitHeight: implicitContentHeight + topPadding + bottomPadding + implicitWidth: Math.max(implicitBackgroundWidth, + implicitContentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(implicitBackgroundHeight, + implicitContentHeight + topPadding + bottomPadding) contentItem: BusyIndicatorImpl { implicitWidth: 20 |