aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/imports/controls/BusyIndicator.qml6
-rw-r--r--src/imports/controls/fusion/BusyIndicator.qml6
-rw-r--r--src/imports/controls/material/BusyIndicator.qml6
-rw-r--r--src/imports/controls/universal/BusyIndicator.qml6
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