diff options
121 files changed, 236 insertions, 236 deletions
diff --git a/src/imports/controls/AbstractButton.qml b/src/imports/controls/AbstractButton.qml index 3e47d66b..fff07a58 100644 --- a/src/imports/controls/AbstractButton.qml +++ b/src/imports/controls/AbstractButton.qml @@ -41,7 +41,7 @@ T.AbstractButton { id: control implicitWidth: Math.max(implicitBackgroundWidth, - (contentItem ? contentItem.implicitWidth : 0) + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - (contentItem ? contentItem.implicitHeight : 0) + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) } diff --git a/src/imports/controls/BusyIndicator.qml b/src/imports/controls/BusyIndicator.qml index 13fd52c4..ced5aa7f 100644 --- a/src/imports/controls/BusyIndicator.qml +++ b/src/imports/controls/BusyIndicator.qml @@ -42,8 +42,8 @@ import QtQuick.Templates 2.5 as T T.BusyIndicator { id: control - implicitWidth: contentItem.implicitWidth + leftPadding + rightPadding - implicitHeight: contentItem.implicitHeight + topPadding + bottomPadding + implicitWidth: implicitContentWidth + leftPadding + rightPadding + implicitHeight: implicitContentHeight + topPadding + bottomPadding padding: 6 diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml index ac7afaea..c449a828 100644 --- a/src/imports/controls/Button.qml +++ b/src/imports/controls/Button.qml @@ -43,9 +43,9 @@ T.Button { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) padding: 6 horizontalPadding: padding + 2 diff --git a/src/imports/controls/CheckBox.qml b/src/imports/controls/CheckBox.qml index 76e1b64c..136804f0 100644 --- a/src/imports/controls/CheckBox.qml +++ b/src/imports/controls/CheckBox.qml @@ -43,9 +43,9 @@ T.CheckBox { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) padding: 6 diff --git a/src/imports/controls/CheckDelegate.qml b/src/imports/controls/CheckDelegate.qml index 39aa2384..28bde03d 100644 --- a/src/imports/controls/CheckDelegate.qml +++ b/src/imports/controls/CheckDelegate.qml @@ -43,9 +43,9 @@ T.CheckDelegate { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) padding: 12 diff --git a/src/imports/controls/ComboBox.qml b/src/imports/controls/ComboBox.qml index 11fb32c0..4d44831e 100644 --- a/src/imports/controls/ComboBox.qml +++ b/src/imports/controls/ComboBox.qml @@ -44,9 +44,9 @@ T.ComboBox { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) leftPadding: padding + (!control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width + spacing) diff --git a/src/imports/controls/Control.qml b/src/imports/controls/Control.qml index b2f30ece..15e65071 100644 --- a/src/imports/controls/Control.qml +++ b/src/imports/controls/Control.qml @@ -41,7 +41,7 @@ T.Control { id: control implicitWidth: Math.max(implicitBackgroundWidth, - (contentItem ? contentItem.implicitWidth : 0) + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - (contentItem ? contentItem.implicitHeight : 0) + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) } diff --git a/src/imports/controls/DelayButton.qml b/src/imports/controls/DelayButton.qml index 51c05f30..8e08d976 100644 --- a/src/imports/controls/DelayButton.qml +++ b/src/imports/controls/DelayButton.qml @@ -43,9 +43,9 @@ T.DelayButton { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) padding: 6 horizontalPadding: padding + 2 diff --git a/src/imports/controls/ItemDelegate.qml b/src/imports/controls/ItemDelegate.qml index 93326fc6..3c39698f 100644 --- a/src/imports/controls/ItemDelegate.qml +++ b/src/imports/controls/ItemDelegate.qml @@ -43,9 +43,9 @@ T.ItemDelegate { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) padding: 12 diff --git a/src/imports/controls/MenuBarItem.qml b/src/imports/controls/MenuBarItem.qml index 252b2896..6ce16dc1 100644 --- a/src/imports/controls/MenuBarItem.qml +++ b/src/imports/controls/MenuBarItem.qml @@ -43,9 +43,9 @@ T.MenuBarItem { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) spacing: 6 diff --git a/src/imports/controls/MenuItem.qml b/src/imports/controls/MenuItem.qml index 2f1e9592..8b4b03ef 100644 --- a/src/imports/controls/MenuItem.qml +++ b/src/imports/controls/MenuItem.qml @@ -43,9 +43,9 @@ T.MenuItem { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) padding: 6 diff --git a/src/imports/controls/MenuSeparator.qml b/src/imports/controls/MenuSeparator.qml index a762ba3f..b76edb38 100644 --- a/src/imports/controls/MenuSeparator.qml +++ b/src/imports/controls/MenuSeparator.qml @@ -42,8 +42,8 @@ import QtQuick.Templates 2.5 as T T.MenuSeparator { id: control - implicitWidth: Math.max(implicitBackgroundWidth, contentItem.implicitWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight, contentItem.implicitHeight + topPadding + bottomPadding) + implicitWidth: Math.max(implicitBackgroundWidth, implicitContentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(implicitBackgroundHeight, implicitContentHeight + topPadding + bottomPadding) padding: 2 verticalPadding: padding + 4 diff --git a/src/imports/controls/PageIndicator.qml b/src/imports/controls/PageIndicator.qml index 7a9a870e..7d9fbca7 100644 --- a/src/imports/controls/PageIndicator.qml +++ b/src/imports/controls/PageIndicator.qml @@ -43,9 +43,9 @@ T.PageIndicator { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) padding: 6 spacing: 6 diff --git a/src/imports/controls/ProgressBar.qml b/src/imports/controls/ProgressBar.qml index 4ac22f7d..b8e0b0fe 100644 --- a/src/imports/controls/ProgressBar.qml +++ b/src/imports/controls/ProgressBar.qml @@ -43,9 +43,9 @@ T.ProgressBar { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) contentItem: ProgressBarImpl { implicitHeight: 6 diff --git a/src/imports/controls/RadioButton.qml b/src/imports/controls/RadioButton.qml index b0b50139..b6c1b267 100644 --- a/src/imports/controls/RadioButton.qml +++ b/src/imports/controls/RadioButton.qml @@ -43,9 +43,9 @@ T.RadioButton { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) padding: 6 diff --git a/src/imports/controls/RadioDelegate.qml b/src/imports/controls/RadioDelegate.qml index 4788a1cc..23ffc7dc 100644 --- a/src/imports/controls/RadioDelegate.qml +++ b/src/imports/controls/RadioDelegate.qml @@ -43,9 +43,9 @@ T.RadioDelegate { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) padding: 12 diff --git a/src/imports/controls/RoundButton.qml b/src/imports/controls/RoundButton.qml index e50b0ddc..2df0a736 100644 --- a/src/imports/controls/RoundButton.qml +++ b/src/imports/controls/RoundButton.qml @@ -43,9 +43,9 @@ T.RoundButton { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) padding: 6 spacing: 6 diff --git a/src/imports/controls/ScrollBar.qml b/src/imports/controls/ScrollBar.qml index a46397d4..fa61fe63 100644 --- a/src/imports/controls/ScrollBar.qml +++ b/src/imports/controls/ScrollBar.qml @@ -43,9 +43,9 @@ T.ScrollBar { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) padding: 2 visible: control.policy !== T.ScrollBar.AlwaysOff diff --git a/src/imports/controls/ScrollIndicator.qml b/src/imports/controls/ScrollIndicator.qml index 83433654..359d2a54 100644 --- a/src/imports/controls/ScrollIndicator.qml +++ b/src/imports/controls/ScrollIndicator.qml @@ -43,9 +43,9 @@ T.ScrollIndicator { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) padding: 2 diff --git a/src/imports/controls/SpinBox.qml b/src/imports/controls/SpinBox.qml index 260f6612..9ee64733 100644 --- a/src/imports/controls/SpinBox.qml +++ b/src/imports/controls/SpinBox.qml @@ -46,7 +46,7 @@ T.SpinBox { contentItem.implicitWidth + 2 * padding + (up.indicator ? up.indicator.implicitWidth : 0) + (down.indicator ? down.indicator.implicitWidth : 0)) - implicitHeight: Math.max(contentItem.implicitHeight + topPadding + bottomPadding, + implicitHeight: Math.max(implicitContentHeight + topPadding + bottomPadding, implicitBackgroundHeight, up.indicator ? up.indicator.implicitHeight : 0, down.indicator ? down.indicator.implicitHeight : 0) diff --git a/src/imports/controls/SwipeDelegate.qml b/src/imports/controls/SwipeDelegate.qml index 21a896a9..75533622 100644 --- a/src/imports/controls/SwipeDelegate.qml +++ b/src/imports/controls/SwipeDelegate.qml @@ -43,9 +43,9 @@ T.SwipeDelegate { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) padding: 12 diff --git a/src/imports/controls/Switch.qml b/src/imports/controls/Switch.qml index 4111cb40..eaa46538 100644 --- a/src/imports/controls/Switch.qml +++ b/src/imports/controls/Switch.qml @@ -43,9 +43,9 @@ T.Switch { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) padding: 6 diff --git a/src/imports/controls/SwitchDelegate.qml b/src/imports/controls/SwitchDelegate.qml index 7747f915..8140b7bd 100644 --- a/src/imports/controls/SwitchDelegate.qml +++ b/src/imports/controls/SwitchDelegate.qml @@ -43,9 +43,9 @@ T.SwitchDelegate { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) padding: 12 diff --git a/src/imports/controls/TabButton.qml b/src/imports/controls/TabButton.qml index e67846bf..dcf16af6 100644 --- a/src/imports/controls/TabButton.qml +++ b/src/imports/controls/TabButton.qml @@ -43,9 +43,9 @@ T.TabButton { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) padding: 6 spacing: 6 diff --git a/src/imports/controls/ToolButton.qml b/src/imports/controls/ToolButton.qml index 76a3a323..2206f20d 100644 --- a/src/imports/controls/ToolButton.qml +++ b/src/imports/controls/ToolButton.qml @@ -43,9 +43,9 @@ T.ToolButton { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) padding: 6 spacing: 6 diff --git a/src/imports/controls/ToolSeparator.qml b/src/imports/controls/ToolSeparator.qml index 351126cd..0d8a704d 100644 --- a/src/imports/controls/ToolSeparator.qml +++ b/src/imports/controls/ToolSeparator.qml @@ -42,8 +42,8 @@ import QtQuick.Templates 2.5 as T T.ToolSeparator { id: control - implicitWidth: Math.max(implicitBackgroundWidth, contentItem.implicitWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight, contentItem.implicitHeight + topPadding + bottomPadding) + implicitWidth: Math.max(implicitBackgroundWidth, implicitContentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(implicitBackgroundHeight, implicitContentHeight + topPadding + bottomPadding) padding: vertical ? 6 : 2 verticalPadding: vertical ? 2 : 6 diff --git a/src/imports/controls/fusion/BusyIndicator.qml b/src/imports/controls/fusion/BusyIndicator.qml index 2658f477..71d83080 100644 --- a/src/imports/controls/fusion/BusyIndicator.qml +++ b/src/imports/controls/fusion/BusyIndicator.qml @@ -44,8 +44,8 @@ import QtQuick.Controls.Fusion.impl 2.5 T.BusyIndicator { id: control - implicitWidth: contentItem.implicitWidth + leftPadding + rightPadding - implicitHeight: contentItem.implicitHeight + topPadding + bottomPadding + implicitWidth: implicitContentWidth + leftPadding + rightPadding + implicitHeight: implicitContentHeight + topPadding + bottomPadding padding: 6 diff --git a/src/imports/controls/fusion/Button.qml b/src/imports/controls/fusion/Button.qml index 37ee94fd..db35b8ad 100644 --- a/src/imports/controls/fusion/Button.qml +++ b/src/imports/controls/fusion/Button.qml @@ -45,9 +45,9 @@ T.Button { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) padding: 4 spacing: 6 diff --git a/src/imports/controls/fusion/CheckBox.qml b/src/imports/controls/fusion/CheckBox.qml index 6b28ca15..52debad6 100644 --- a/src/imports/controls/fusion/CheckBox.qml +++ b/src/imports/controls/fusion/CheckBox.qml @@ -45,9 +45,9 @@ T.CheckBox { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) padding: 6 diff --git a/src/imports/controls/fusion/CheckDelegate.qml b/src/imports/controls/fusion/CheckDelegate.qml index c662ad9c..f11f4493 100644 --- a/src/imports/controls/fusion/CheckDelegate.qml +++ b/src/imports/controls/fusion/CheckDelegate.qml @@ -45,9 +45,9 @@ T.CheckDelegate { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) padding: 6 diff --git a/src/imports/controls/fusion/ComboBox.qml b/src/imports/controls/fusion/ComboBox.qml index 3ce7d246..18cc69a6 100644 --- a/src/imports/controls/fusion/ComboBox.qml +++ b/src/imports/controls/fusion/ComboBox.qml @@ -46,9 +46,9 @@ T.ComboBox { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) leftPadding: padding + (!control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width + spacing) diff --git a/src/imports/controls/fusion/DelayButton.qml b/src/imports/controls/fusion/DelayButton.qml index dbfdb8d9..6a485e61 100644 --- a/src/imports/controls/fusion/DelayButton.qml +++ b/src/imports/controls/fusion/DelayButton.qml @@ -45,9 +45,9 @@ T.DelayButton { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) padding: 6 diff --git a/src/imports/controls/fusion/ItemDelegate.qml b/src/imports/controls/fusion/ItemDelegate.qml index 6556e3ae..d4b6e695 100644 --- a/src/imports/controls/fusion/ItemDelegate.qml +++ b/src/imports/controls/fusion/ItemDelegate.qml @@ -45,9 +45,9 @@ T.ItemDelegate { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) padding: 6 diff --git a/src/imports/controls/fusion/MenuBarItem.qml b/src/imports/controls/fusion/MenuBarItem.qml index f971e05a..40cf8ba6 100644 --- a/src/imports/controls/fusion/MenuBarItem.qml +++ b/src/imports/controls/fusion/MenuBarItem.qml @@ -45,9 +45,9 @@ T.MenuBarItem { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) padding: 6 diff --git a/src/imports/controls/fusion/MenuItem.qml b/src/imports/controls/fusion/MenuItem.qml index 934c3f01..e1f85f86 100644 --- a/src/imports/controls/fusion/MenuItem.qml +++ b/src/imports/controls/fusion/MenuItem.qml @@ -45,9 +45,9 @@ T.MenuItem { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) padding: 6 diff --git a/src/imports/controls/fusion/MenuSeparator.qml b/src/imports/controls/fusion/MenuSeparator.qml index 4a7f1986..9e8b3c04 100644 --- a/src/imports/controls/fusion/MenuSeparator.qml +++ b/src/imports/controls/fusion/MenuSeparator.qml @@ -44,8 +44,8 @@ import QtQuick.Controls.Fusion.impl 2.5 T.MenuSeparator { id: control - implicitWidth: Math.max(implicitBackgroundWidth, contentItem.implicitWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight, contentItem.implicitHeight + topPadding + bottomPadding) + implicitWidth: Math.max(implicitBackgroundWidth, implicitContentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(implicitBackgroundHeight, implicitContentHeight + topPadding + bottomPadding) padding: 5 verticalPadding: 1 diff --git a/src/imports/controls/fusion/PageIndicator.qml b/src/imports/controls/fusion/PageIndicator.qml index 867e5e92..93b05eff 100644 --- a/src/imports/controls/fusion/PageIndicator.qml +++ b/src/imports/controls/fusion/PageIndicator.qml @@ -45,9 +45,9 @@ T.PageIndicator { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) padding: 4 spacing: 4 diff --git a/src/imports/controls/fusion/ProgressBar.qml b/src/imports/controls/fusion/ProgressBar.qml index 17317a29..29194da5 100644 --- a/src/imports/controls/fusion/ProgressBar.qml +++ b/src/imports/controls/fusion/ProgressBar.qml @@ -45,9 +45,9 @@ T.ProgressBar { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem ? contentItem.implicitWidth + leftPadding + rightPadding : 0) + contentItem ? implicitContentWidth + leftPadding + rightPadding : 0) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem ? contentItem.implicitHeight + topPadding + bottomPadding : 0) + contentItem ? implicitContentHeight + topPadding + bottomPadding : 0) contentItem: Item { implicitWidth: 120 diff --git a/src/imports/controls/fusion/RadioButton.qml b/src/imports/controls/fusion/RadioButton.qml index b2c6d464..c9609ac3 100644 --- a/src/imports/controls/fusion/RadioButton.qml +++ b/src/imports/controls/fusion/RadioButton.qml @@ -45,9 +45,9 @@ T.RadioButton { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) padding: 6 diff --git a/src/imports/controls/fusion/RadioDelegate.qml b/src/imports/controls/fusion/RadioDelegate.qml index 8c0953c4..4cc95502 100644 --- a/src/imports/controls/fusion/RadioDelegate.qml +++ b/src/imports/controls/fusion/RadioDelegate.qml @@ -45,9 +45,9 @@ T.RadioDelegate { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) padding: 6 diff --git a/src/imports/controls/fusion/RoundButton.qml b/src/imports/controls/fusion/RoundButton.qml index 513fa33a..e4259678 100644 --- a/src/imports/controls/fusion/RoundButton.qml +++ b/src/imports/controls/fusion/RoundButton.qml @@ -45,9 +45,9 @@ T.RoundButton { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) padding: 6 spacing: 6 diff --git a/src/imports/controls/fusion/ScrollBar.qml b/src/imports/controls/fusion/ScrollBar.qml index dacbf51d..c37ec838 100644 --- a/src/imports/controls/fusion/ScrollBar.qml +++ b/src/imports/controls/fusion/ScrollBar.qml @@ -45,9 +45,9 @@ T.ScrollBar { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) padding: 2 visible: control.policy !== T.ScrollBar.AlwaysOff diff --git a/src/imports/controls/fusion/ScrollIndicator.qml b/src/imports/controls/fusion/ScrollIndicator.qml index 5f7c4c23..5711d2ed 100644 --- a/src/imports/controls/fusion/ScrollIndicator.qml +++ b/src/imports/controls/fusion/ScrollIndicator.qml @@ -45,9 +45,9 @@ T.ScrollIndicator { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) padding: 2 diff --git a/src/imports/controls/fusion/SpinBox.qml b/src/imports/controls/fusion/SpinBox.qml index 5f544fbd..455510f9 100644 --- a/src/imports/controls/fusion/SpinBox.qml +++ b/src/imports/controls/fusion/SpinBox.qml @@ -48,7 +48,7 @@ T.SpinBox { contentItem.implicitWidth + 2 * padding + Math.max(up.indicator ? up.indicator.implicitWidth : 0, down.indicator ? down.indicator.implicitWidth : 0)) - implicitHeight: Math.max(contentItem.implicitHeight + topPadding + bottomPadding, + implicitHeight: Math.max(implicitContentHeight + topPadding + bottomPadding, implicitBackgroundHeight, (up.indicator ? up.indicator.implicitHeight : 0 + down.indicator ? down.indicator.implicitHeight : 0)) diff --git a/src/imports/controls/fusion/SwipeDelegate.qml b/src/imports/controls/fusion/SwipeDelegate.qml index 20234ca8..7bf144de 100644 --- a/src/imports/controls/fusion/SwipeDelegate.qml +++ b/src/imports/controls/fusion/SwipeDelegate.qml @@ -45,9 +45,9 @@ T.SwipeDelegate { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) padding: 6 diff --git a/src/imports/controls/fusion/Switch.qml b/src/imports/controls/fusion/Switch.qml index 02d542ff..c533f1a8 100644 --- a/src/imports/controls/fusion/Switch.qml +++ b/src/imports/controls/fusion/Switch.qml @@ -45,9 +45,9 @@ T.Switch { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) padding: 6 diff --git a/src/imports/controls/fusion/SwitchDelegate.qml b/src/imports/controls/fusion/SwitchDelegate.qml index a07e8eac..33f5472f 100644 --- a/src/imports/controls/fusion/SwitchDelegate.qml +++ b/src/imports/controls/fusion/SwitchDelegate.qml @@ -45,9 +45,9 @@ T.SwitchDelegate { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) padding: 6 diff --git a/src/imports/controls/fusion/TabButton.qml b/src/imports/controls/fusion/TabButton.qml index ab65766f..09c45dc8 100644 --- a/src/imports/controls/fusion/TabButton.qml +++ b/src/imports/controls/fusion/TabButton.qml @@ -45,9 +45,9 @@ T.TabButton { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) padding: 2 horizontalPadding: 4 diff --git a/src/imports/controls/fusion/ToolButton.qml b/src/imports/controls/fusion/ToolButton.qml index c866e382..f2e94c24 100644 --- a/src/imports/controls/fusion/ToolButton.qml +++ b/src/imports/controls/fusion/ToolButton.qml @@ -45,9 +45,9 @@ T.ToolButton { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) padding: 6 spacing: 6 diff --git a/src/imports/controls/fusion/ToolSeparator.qml b/src/imports/controls/fusion/ToolSeparator.qml index 16a0e90a..469f9265 100644 --- a/src/imports/controls/fusion/ToolSeparator.qml +++ b/src/imports/controls/fusion/ToolSeparator.qml @@ -44,8 +44,8 @@ import QtQuick.Controls.Fusion.impl 2.5 T.ToolSeparator { id: control - implicitWidth: Math.max(implicitBackgroundWidth, contentItem.implicitWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight, contentItem.implicitHeight + topPadding + bottomPadding) + implicitWidth: Math.max(implicitBackgroundWidth, implicitContentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(implicitBackgroundHeight, implicitContentHeight + topPadding + bottomPadding) padding: vertical ? 6 : 2 verticalPadding: vertical ? 2 : 6 diff --git a/src/imports/controls/imagine/BusyIndicator.qml b/src/imports/controls/imagine/BusyIndicator.qml index 57db9b31..0637a467 100644 --- a/src/imports/controls/imagine/BusyIndicator.qml +++ b/src/imports/controls/imagine/BusyIndicator.qml @@ -43,9 +43,9 @@ T.BusyIndicator { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) topPadding: background ? background.topPadding : 0 leftPadding: background ? background.leftPadding : 0 diff --git a/src/imports/controls/imagine/Button.qml b/src/imports/controls/imagine/Button.qml index aa6289c2..e6a1b259 100644 --- a/src/imports/controls/imagine/Button.qml +++ b/src/imports/controls/imagine/Button.qml @@ -45,9 +45,9 @@ T.Button { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) spacing: 6 // ### diff --git a/src/imports/controls/imagine/CheckBox.qml b/src/imports/controls/imagine/CheckBox.qml index 7e663e8c..bcbae953 100644 --- a/src/imports/controls/imagine/CheckBox.qml +++ b/src/imports/controls/imagine/CheckBox.qml @@ -43,9 +43,9 @@ T.CheckBox { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) spacing: 6 // ### diff --git a/src/imports/controls/imagine/CheckDelegate.qml b/src/imports/controls/imagine/CheckDelegate.qml index 254cae54..c50470dd 100644 --- a/src/imports/controls/imagine/CheckDelegate.qml +++ b/src/imports/controls/imagine/CheckDelegate.qml @@ -45,9 +45,9 @@ T.CheckDelegate { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) spacing: 12 // ### diff --git a/src/imports/controls/imagine/ComboBox.qml b/src/imports/controls/imagine/ComboBox.qml index a7b835a4..b8a8caa2 100644 --- a/src/imports/controls/imagine/ComboBox.qml +++ b/src/imports/controls/imagine/ComboBox.qml @@ -47,7 +47,7 @@ T.ComboBox { implicitWidth: Math.max(implicitBackgroundWidth, contentItem.implicitWidth + background ? (background.leftPadding + background.rightPadding) : 0) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + background ? (background.topPadding + background.bottomPadding) : 0) leftPadding: padding + (!control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width + spacing) diff --git a/src/imports/controls/imagine/DelayButton.qml b/src/imports/controls/imagine/DelayButton.qml index 8d8ba34b..5aa8bb49 100644 --- a/src/imports/controls/imagine/DelayButton.qml +++ b/src/imports/controls/imagine/DelayButton.qml @@ -44,9 +44,9 @@ T.DelayButton { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) topPadding: background ? background.topPadding : 0 leftPadding: background ? background.leftPadding : 0 diff --git a/src/imports/controls/imagine/ItemDelegate.qml b/src/imports/controls/imagine/ItemDelegate.qml index 48f98cb2..9059e67f 100644 --- a/src/imports/controls/imagine/ItemDelegate.qml +++ b/src/imports/controls/imagine/ItemDelegate.qml @@ -45,9 +45,9 @@ T.ItemDelegate { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) spacing: 12 // ### diff --git a/src/imports/controls/imagine/MenuItem.qml b/src/imports/controls/imagine/MenuItem.qml index 2971717b..bb21e9e2 100644 --- a/src/imports/controls/imagine/MenuItem.qml +++ b/src/imports/controls/imagine/MenuItem.qml @@ -45,9 +45,9 @@ T.MenuItem { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) spacing: 6 // ### diff --git a/src/imports/controls/imagine/MenuSeparator.qml b/src/imports/controls/imagine/MenuSeparator.qml index 90cb62ab..2e6ebee4 100644 --- a/src/imports/controls/imagine/MenuSeparator.qml +++ b/src/imports/controls/imagine/MenuSeparator.qml @@ -43,9 +43,9 @@ T.MenuSeparator { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem ? contentItem.implicitWidth + leftPadding + rightPadding : 0) + contentItem ? implicitContentWidth + leftPadding + rightPadding : 0) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem ? contentItem.implicitHeight + topPadding + bottomPadding : 0) + contentItem ? implicitContentHeight + topPadding + bottomPadding : 0) topPadding: background ? background.topPadding : 0 leftPadding: background ? background.leftPadding : 0 diff --git a/src/imports/controls/imagine/PageIndicator.qml b/src/imports/controls/imagine/PageIndicator.qml index dc4e8f34..bb022c83 100644 --- a/src/imports/controls/imagine/PageIndicator.qml +++ b/src/imports/controls/imagine/PageIndicator.qml @@ -43,9 +43,9 @@ T.PageIndicator { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) topPadding: background ? background.topPadding : 0 leftPadding: background ? background.leftPadding : 0 diff --git a/src/imports/controls/imagine/ProgressBar.qml b/src/imports/controls/imagine/ProgressBar.qml index c85f6246..a5bf14e1 100644 --- a/src/imports/controls/imagine/ProgressBar.qml +++ b/src/imports/controls/imagine/ProgressBar.qml @@ -44,9 +44,9 @@ T.ProgressBar { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) topPadding: background ? background.topPadding : 0 leftPadding: background ? background.leftPadding : 0 diff --git a/src/imports/controls/imagine/RadioButton.qml b/src/imports/controls/imagine/RadioButton.qml index 6d3c5e19..9c84035b 100644 --- a/src/imports/controls/imagine/RadioButton.qml +++ b/src/imports/controls/imagine/RadioButton.qml @@ -43,9 +43,9 @@ T.RadioButton { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) spacing: 6 // ### diff --git a/src/imports/controls/imagine/RadioDelegate.qml b/src/imports/controls/imagine/RadioDelegate.qml index 23c30f63..b1028899 100644 --- a/src/imports/controls/imagine/RadioDelegate.qml +++ b/src/imports/controls/imagine/RadioDelegate.qml @@ -45,9 +45,9 @@ T.RadioDelegate { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) spacing: 12 // ### diff --git a/src/imports/controls/imagine/RoundButton.qml b/src/imports/controls/imagine/RoundButton.qml index b69f9f6f..ffb36578 100644 --- a/src/imports/controls/imagine/RoundButton.qml +++ b/src/imports/controls/imagine/RoundButton.qml @@ -45,9 +45,9 @@ T.RoundButton { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) topPadding: background ? background.topPadding : 0 leftPadding: background ? background.leftPadding : 0 diff --git a/src/imports/controls/imagine/ScrollBar.qml b/src/imports/controls/imagine/ScrollBar.qml index 495d7632..7f302297 100644 --- a/src/imports/controls/imagine/ScrollBar.qml +++ b/src/imports/controls/imagine/ScrollBar.qml @@ -43,9 +43,9 @@ T.ScrollBar { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) visible: control.policy !== T.ScrollBar.AlwaysOff diff --git a/src/imports/controls/imagine/ScrollIndicator.qml b/src/imports/controls/imagine/ScrollIndicator.qml index c925b772..c663fce7 100644 --- a/src/imports/controls/imagine/ScrollIndicator.qml +++ b/src/imports/controls/imagine/ScrollIndicator.qml @@ -43,9 +43,9 @@ T.ScrollIndicator { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) topPadding: background ? background.topPadding : 0 leftPadding: background ? background.leftPadding : 0 diff --git a/src/imports/controls/imagine/SpinBox.qml b/src/imports/controls/imagine/SpinBox.qml index ec13106e..5d0a7589 100644 --- a/src/imports/controls/imagine/SpinBox.qml +++ b/src/imports/controls/imagine/SpinBox.qml @@ -46,7 +46,7 @@ T.SpinBox { contentItem.implicitWidth + 2 * padding + (up.indicator ? up.indicator.implicitWidth : 0) + (down.indicator ? down.indicator.implicitWidth : 0)) - implicitHeight: Math.max(contentItem.implicitHeight + topPadding + bottomPadding, + implicitHeight: Math.max(implicitContentHeight + topPadding + bottomPadding, implicitBackgroundHeight, up.indicator ? up.indicator.implicitHeight : 0, down.indicator ? down.indicator.implicitHeight : 0) diff --git a/src/imports/controls/imagine/SwipeDelegate.qml b/src/imports/controls/imagine/SwipeDelegate.qml index fbd264fb..22035ca7 100644 --- a/src/imports/controls/imagine/SwipeDelegate.qml +++ b/src/imports/controls/imagine/SwipeDelegate.qml @@ -45,9 +45,9 @@ T.SwipeDelegate { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) spacing: 12 // ### diff --git a/src/imports/controls/imagine/Switch.qml b/src/imports/controls/imagine/Switch.qml index 7ebf6d23..7fd81dee 100644 --- a/src/imports/controls/imagine/Switch.qml +++ b/src/imports/controls/imagine/Switch.qml @@ -43,9 +43,9 @@ T.Switch { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) spacing: 6 // ### diff --git a/src/imports/controls/imagine/SwitchDelegate.qml b/src/imports/controls/imagine/SwitchDelegate.qml index 795bacba..e4f64006 100644 --- a/src/imports/controls/imagine/SwitchDelegate.qml +++ b/src/imports/controls/imagine/SwitchDelegate.qml @@ -45,9 +45,9 @@ T.SwitchDelegate { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) spacing: 12 // ### diff --git a/src/imports/controls/imagine/TabButton.qml b/src/imports/controls/imagine/TabButton.qml index 8f9f38f6..499c1ec9 100644 --- a/src/imports/controls/imagine/TabButton.qml +++ b/src/imports/controls/imagine/TabButton.qml @@ -45,9 +45,9 @@ T.TabButton { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) spacing: 6 // ### diff --git a/src/imports/controls/imagine/ToolButton.qml b/src/imports/controls/imagine/ToolButton.qml index 39c7bdff..93afaeb2 100644 --- a/src/imports/controls/imagine/ToolButton.qml +++ b/src/imports/controls/imagine/ToolButton.qml @@ -45,9 +45,9 @@ T.ToolButton { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) spacing: 6 // ### diff --git a/src/imports/controls/imagine/ToolSeparator.qml b/src/imports/controls/imagine/ToolSeparator.qml index ff547c89..594d6bc2 100644 --- a/src/imports/controls/imagine/ToolSeparator.qml +++ b/src/imports/controls/imagine/ToolSeparator.qml @@ -43,9 +43,9 @@ T.ToolSeparator { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem ? contentItem.implicitWidth + leftPadding + rightPadding : 0) + contentItem ? implicitContentWidth + leftPadding + rightPadding : 0) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem ? contentItem.implicitHeight + topPadding + bottomPadding : 0) + contentItem ? implicitContentHeight + topPadding + bottomPadding : 0) topPadding: background ? background.topPadding : 0 leftPadding: background ? background.leftPadding : 0 diff --git a/src/imports/controls/material/BusyIndicator.qml b/src/imports/controls/material/BusyIndicator.qml index 349b3cb5..90261ac2 100644 --- a/src/imports/controls/material/BusyIndicator.qml +++ b/src/imports/controls/material/BusyIndicator.qml @@ -42,8 +42,8 @@ import QtQuick.Controls.Material.impl 2.5 T.BusyIndicator { id: control - implicitWidth: contentItem.implicitWidth + leftPadding + rightPadding - implicitHeight: contentItem.implicitHeight + topPadding + bottomPadding + implicitWidth: implicitContentWidth + leftPadding + rightPadding + implicitHeight: implicitContentHeight + topPadding + bottomPadding padding: 6 diff --git a/src/imports/controls/material/Button.qml b/src/imports/controls/material/Button.qml index 75560070..e20388a4 100644 --- a/src/imports/controls/material/Button.qml +++ b/src/imports/controls/material/Button.qml @@ -45,9 +45,9 @@ T.Button { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) // external vertical padding is 6 (to increase touch area) padding: 12 diff --git a/src/imports/controls/material/CheckBox.qml b/src/imports/controls/material/CheckBox.qml index 25b45342..d829f842 100644 --- a/src/imports/controls/material/CheckBox.qml +++ b/src/imports/controls/material/CheckBox.qml @@ -43,9 +43,9 @@ T.CheckBox { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) spacing: 8 diff --git a/src/imports/controls/material/CheckDelegate.qml b/src/imports/controls/material/CheckDelegate.qml index 0c009b2a..66e76e0e 100644 --- a/src/imports/controls/material/CheckDelegate.qml +++ b/src/imports/controls/material/CheckDelegate.qml @@ -45,9 +45,9 @@ T.CheckDelegate { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) padding: 16 diff --git a/src/imports/controls/material/ComboBox.qml b/src/imports/controls/material/ComboBox.qml index af52d1a5..a305ece0 100644 --- a/src/imports/controls/material/ComboBox.qml +++ b/src/imports/controls/material/ComboBox.qml @@ -46,9 +46,9 @@ T.ComboBox { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) leftPadding: padding + (!control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width + spacing) diff --git a/src/imports/controls/material/DelayButton.qml b/src/imports/controls/material/DelayButton.qml index deadaa95..8061e6d5 100644 --- a/src/imports/controls/material/DelayButton.qml +++ b/src/imports/controls/material/DelayButton.qml @@ -45,9 +45,9 @@ T.DelayButton { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) // external vertical padding is 6 (to increase touch area) padding: 12 diff --git a/src/imports/controls/material/ItemDelegate.qml b/src/imports/controls/material/ItemDelegate.qml index 6fa21305..abc4f5ac 100644 --- a/src/imports/controls/material/ItemDelegate.qml +++ b/src/imports/controls/material/ItemDelegate.qml @@ -45,9 +45,9 @@ T.ItemDelegate { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) padding: 16 diff --git a/src/imports/controls/material/MenuBarItem.qml b/src/imports/controls/material/MenuBarItem.qml index 3dca6f51..f361a9ec 100644 --- a/src/imports/controls/material/MenuBarItem.qml +++ b/src/imports/controls/material/MenuBarItem.qml @@ -45,9 +45,9 @@ T.MenuBarItem { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) padding: 16 verticalPadding: 12 diff --git a/src/imports/controls/material/MenuItem.qml b/src/imports/controls/material/MenuItem.qml index 080c3655..7ae0e103 100644 --- a/src/imports/controls/material/MenuItem.qml +++ b/src/imports/controls/material/MenuItem.qml @@ -45,9 +45,9 @@ T.MenuItem { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) padding: 16 diff --git a/src/imports/controls/material/MenuSeparator.qml b/src/imports/controls/material/MenuSeparator.qml index 9fd8f687..ff535411 100644 --- a/src/imports/controls/material/MenuSeparator.qml +++ b/src/imports/controls/material/MenuSeparator.qml @@ -41,8 +41,8 @@ import QtQuick.Controls.Material 2.5 T.MenuSeparator { id: control - implicitWidth: Math.max(implicitBackgroundWidth, contentItem.implicitWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight, contentItem.implicitHeight + topPadding + bottomPadding) + implicitWidth: Math.max(implicitBackgroundWidth, implicitContentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(implicitBackgroundHeight, implicitContentHeight + topPadding + bottomPadding) verticalPadding: 8 diff --git a/src/imports/controls/material/PageIndicator.qml b/src/imports/controls/material/PageIndicator.qml index 29797b6c..b02f19b0 100644 --- a/src/imports/controls/material/PageIndicator.qml +++ b/src/imports/controls/material/PageIndicator.qml @@ -42,9 +42,9 @@ T.PageIndicator { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) padding: 6 spacing: 6 diff --git a/src/imports/controls/material/ProgressBar.qml b/src/imports/controls/material/ProgressBar.qml index 714145eb..d2f31847 100644 --- a/src/imports/controls/material/ProgressBar.qml +++ b/src/imports/controls/material/ProgressBar.qml @@ -43,9 +43,9 @@ T.ProgressBar { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) contentItem: ProgressBarImpl { implicitHeight: 4 diff --git a/src/imports/controls/material/RadioButton.qml b/src/imports/controls/material/RadioButton.qml index b3953121..b7744a85 100644 --- a/src/imports/controls/material/RadioButton.qml +++ b/src/imports/controls/material/RadioButton.qml @@ -43,9 +43,9 @@ T.RadioButton { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) spacing: 8 diff --git a/src/imports/controls/material/RadioDelegate.qml b/src/imports/controls/material/RadioDelegate.qml index 675bd341..bec8f64b 100644 --- a/src/imports/controls/material/RadioDelegate.qml +++ b/src/imports/controls/material/RadioDelegate.qml @@ -45,9 +45,9 @@ T.RadioDelegate { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) padding: 16 diff --git a/src/imports/controls/material/RoundButton.qml b/src/imports/controls/material/RoundButton.qml index 8701f445..4a1b5f75 100644 --- a/src/imports/controls/material/RoundButton.qml +++ b/src/imports/controls/material/RoundButton.qml @@ -45,9 +45,9 @@ T.RoundButton { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) // external vertical padding is 6 (to increase touch area) padding: 12 diff --git a/src/imports/controls/material/ScrollBar.qml b/src/imports/controls/material/ScrollBar.qml index f5e6d92a..6c2e7fd9 100644 --- a/src/imports/controls/material/ScrollBar.qml +++ b/src/imports/controls/material/ScrollBar.qml @@ -42,9 +42,9 @@ T.ScrollBar { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) padding: control.interactive ? 1 : 2 visible: control.policy !== T.ScrollBar.AlwaysOff diff --git a/src/imports/controls/material/ScrollIndicator.qml b/src/imports/controls/material/ScrollIndicator.qml index 625d1042..3c06e12f 100644 --- a/src/imports/controls/material/ScrollIndicator.qml +++ b/src/imports/controls/material/ScrollIndicator.qml @@ -42,9 +42,9 @@ T.ScrollIndicator { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) padding: 2 diff --git a/src/imports/controls/material/SpinBox.qml b/src/imports/controls/material/SpinBox.qml index c104012f..f2593991 100644 --- a/src/imports/controls/material/SpinBox.qml +++ b/src/imports/controls/material/SpinBox.qml @@ -46,7 +46,7 @@ T.SpinBox { contentItem.implicitWidth + (up.indicator ? up.indicator.implicitWidth : 0) + (down.indicator ? down.indicator.implicitWidth : 0)) - implicitHeight: Math.max(contentItem.implicitHeight + topPadding + bottomPadding, + implicitHeight: Math.max(implicitContentHeight + topPadding + bottomPadding, implicitBackgroundHeight, up.indicator ? up.indicator.implicitHeight : 0, down.indicator ? down.indicator.implicitHeight : 0) diff --git a/src/imports/controls/material/SwipeDelegate.qml b/src/imports/controls/material/SwipeDelegate.qml index e00ded2f..fc4dbc20 100644 --- a/src/imports/controls/material/SwipeDelegate.qml +++ b/src/imports/controls/material/SwipeDelegate.qml @@ -45,9 +45,9 @@ T.SwipeDelegate { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) padding: 16 diff --git a/src/imports/controls/material/Switch.qml b/src/imports/controls/material/Switch.qml index a184177c..c595465d 100644 --- a/src/imports/controls/material/Switch.qml +++ b/src/imports/controls/material/Switch.qml @@ -43,9 +43,9 @@ T.Switch { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) padding: 8 diff --git a/src/imports/controls/material/SwitchDelegate.qml b/src/imports/controls/material/SwitchDelegate.qml index 3fdab2da..0e62ea7d 100644 --- a/src/imports/controls/material/SwitchDelegate.qml +++ b/src/imports/controls/material/SwitchDelegate.qml @@ -45,9 +45,9 @@ T.SwitchDelegate { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) padding: 16 diff --git a/src/imports/controls/material/TabButton.qml b/src/imports/controls/material/TabButton.qml index a7d48cb0..36114ffc 100644 --- a/src/imports/controls/material/TabButton.qml +++ b/src/imports/controls/material/TabButton.qml @@ -45,9 +45,9 @@ T.TabButton { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) padding: 12 spacing: 6 diff --git a/src/imports/controls/material/ToolButton.qml b/src/imports/controls/material/ToolButton.qml index 0c200255..90e54b7a 100644 --- a/src/imports/controls/material/ToolButton.qml +++ b/src/imports/controls/material/ToolButton.qml @@ -45,9 +45,9 @@ T.ToolButton { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) padding: 6 spacing: 6 diff --git a/src/imports/controls/material/ToolSeparator.qml b/src/imports/controls/material/ToolSeparator.qml index 7c771e77..4d7b0623 100644 --- a/src/imports/controls/material/ToolSeparator.qml +++ b/src/imports/controls/material/ToolSeparator.qml @@ -41,8 +41,8 @@ import QtQuick.Controls.Material 2.5 T.ToolSeparator { id: control - implicitWidth: Math.max(implicitBackgroundWidth, contentItem.implicitWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight, contentItem.implicitHeight + topPadding + bottomPadding) + implicitWidth: Math.max(implicitBackgroundWidth, implicitContentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(implicitBackgroundHeight, implicitContentHeight + topPadding + bottomPadding) horizontalPadding: vertical ? 12 : 5 verticalPadding: vertical ? 5 : 12 diff --git a/src/imports/controls/universal/BusyIndicator.qml b/src/imports/controls/universal/BusyIndicator.qml index 80f8ae1c..8ecdbdec 100644 --- a/src/imports/controls/universal/BusyIndicator.qml +++ b/src/imports/controls/universal/BusyIndicator.qml @@ -42,8 +42,8 @@ import QtQuick.Controls.Universal.impl 2.5 T.BusyIndicator { id: control - implicitWidth: contentItem.implicitWidth + leftPadding + rightPadding - implicitHeight: contentItem.implicitHeight + topPadding + bottomPadding + implicitWidth: implicitContentWidth + leftPadding + rightPadding + implicitHeight: implicitContentHeight + topPadding + bottomPadding contentItem: BusyIndicatorImpl { implicitWidth: 20 diff --git a/src/imports/controls/universal/Button.qml b/src/imports/controls/universal/Button.qml index a3d0f86f..5e427a7b 100644 --- a/src/imports/controls/universal/Button.qml +++ b/src/imports/controls/universal/Button.qml @@ -44,9 +44,9 @@ T.Button { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) padding: 8 verticalPadding: padding - 4 diff --git a/src/imports/controls/universal/CheckBox.qml b/src/imports/controls/universal/CheckBox.qml index b4665e1a..64fbe793 100644 --- a/src/imports/controls/universal/CheckBox.qml +++ b/src/imports/controls/universal/CheckBox.qml @@ -43,9 +43,9 @@ T.CheckBox { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) padding: 6 diff --git a/src/imports/controls/universal/CheckDelegate.qml b/src/imports/controls/universal/CheckDelegate.qml index b9c653dd..63c700f6 100644 --- a/src/imports/controls/universal/CheckDelegate.qml +++ b/src/imports/controls/universal/CheckDelegate.qml @@ -45,9 +45,9 @@ T.CheckDelegate { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) spacing: 12 diff --git a/src/imports/controls/universal/ComboBox.qml b/src/imports/controls/universal/ComboBox.qml index bd1624a7..c5de22f5 100644 --- a/src/imports/controls/universal/ComboBox.qml +++ b/src/imports/controls/universal/ComboBox.qml @@ -45,9 +45,9 @@ T.ComboBox { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) leftPadding: padding + (!control.mirrored || !indicator || !indicator.visible ? 0 : indicator.width + spacing) diff --git a/src/imports/controls/universal/DelayButton.qml b/src/imports/controls/universal/DelayButton.qml index a18b3167..41a646e4 100644 --- a/src/imports/controls/universal/DelayButton.qml +++ b/src/imports/controls/universal/DelayButton.qml @@ -42,9 +42,9 @@ T.DelayButton { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) padding: 8 verticalPadding: padding - 4 diff --git a/src/imports/controls/universal/ItemDelegate.qml b/src/imports/controls/universal/ItemDelegate.qml index 58f1f564..41e093cd 100644 --- a/src/imports/controls/universal/ItemDelegate.qml +++ b/src/imports/controls/universal/ItemDelegate.qml @@ -44,9 +44,9 @@ T.ItemDelegate { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) spacing: 12 diff --git a/src/imports/controls/universal/MenuBarItem.qml b/src/imports/controls/universal/MenuBarItem.qml index 9cff0b6c..547af7f8 100644 --- a/src/imports/controls/universal/MenuBarItem.qml +++ b/src/imports/controls/universal/MenuBarItem.qml @@ -44,9 +44,9 @@ T.MenuBarItem { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) padding: 12 diff --git a/src/imports/controls/universal/MenuItem.qml b/src/imports/controls/universal/MenuItem.qml index 6fecd7bf..f4bc8921 100644 --- a/src/imports/controls/universal/MenuItem.qml +++ b/src/imports/controls/universal/MenuItem.qml @@ -44,9 +44,9 @@ T.MenuItem { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) padding: 12 diff --git a/src/imports/controls/universal/MenuSeparator.qml b/src/imports/controls/universal/MenuSeparator.qml index 4ef874bd..56270c96 100644 --- a/src/imports/controls/universal/MenuSeparator.qml +++ b/src/imports/controls/universal/MenuSeparator.qml @@ -41,8 +41,8 @@ import QtQuick.Controls.Universal 2.5 T.MenuSeparator { id: control - implicitWidth: Math.max(implicitBackgroundWidth, contentItem.implicitWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight, contentItem.implicitHeight + topPadding + bottomPadding) + implicitWidth: Math.max(implicitBackgroundWidth, implicitContentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(implicitBackgroundHeight, implicitContentHeight + topPadding + bottomPadding) padding: 12 topPadding: 9 diff --git a/src/imports/controls/universal/PageIndicator.qml b/src/imports/controls/universal/PageIndicator.qml index bf249604..12ae2230 100644 --- a/src/imports/controls/universal/PageIndicator.qml +++ b/src/imports/controls/universal/PageIndicator.qml @@ -42,9 +42,9 @@ T.PageIndicator { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) padding: 6 spacing: 7 diff --git a/src/imports/controls/universal/ProgressBar.qml b/src/imports/controls/universal/ProgressBar.qml index 68a514b3..ec0ddb87 100644 --- a/src/imports/controls/universal/ProgressBar.qml +++ b/src/imports/controls/universal/ProgressBar.qml @@ -43,9 +43,9 @@ T.ProgressBar { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) contentItem: ProgressBarImpl { implicitHeight: 10 diff --git a/src/imports/controls/universal/RadioButton.qml b/src/imports/controls/universal/RadioButton.qml index 1c806d58..1ba2d290 100644 --- a/src/imports/controls/universal/RadioButton.qml +++ b/src/imports/controls/universal/RadioButton.qml @@ -43,9 +43,9 @@ T.RadioButton { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) padding: 6 diff --git a/src/imports/controls/universal/RadioDelegate.qml b/src/imports/controls/universal/RadioDelegate.qml index 4737b129..5e9a8234 100644 --- a/src/imports/controls/universal/RadioDelegate.qml +++ b/src/imports/controls/universal/RadioDelegate.qml @@ -45,9 +45,9 @@ T.RadioDelegate { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) spacing: 12 diff --git a/src/imports/controls/universal/RoundButton.qml b/src/imports/controls/universal/RoundButton.qml index 1e600eb8..b6d049aa 100644 --- a/src/imports/controls/universal/RoundButton.qml +++ b/src/imports/controls/universal/RoundButton.qml @@ -44,9 +44,9 @@ T.RoundButton { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) padding: 8 spacing: 8 diff --git a/src/imports/controls/universal/ScrollBar.qml b/src/imports/controls/universal/ScrollBar.qml index fe98fbb1..4cf922a7 100644 --- a/src/imports/controls/universal/ScrollBar.qml +++ b/src/imports/controls/universal/ScrollBar.qml @@ -42,9 +42,9 @@ T.ScrollBar { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) visible: control.policy !== T.ScrollBar.AlwaysOff diff --git a/src/imports/controls/universal/ScrollIndicator.qml b/src/imports/controls/universal/ScrollIndicator.qml index b20b0eb0..7e9675f5 100644 --- a/src/imports/controls/universal/ScrollIndicator.qml +++ b/src/imports/controls/universal/ScrollIndicator.qml @@ -42,9 +42,9 @@ T.ScrollIndicator { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) contentItem: Rectangle { implicitWidth: 6 diff --git a/src/imports/controls/universal/SpinBox.qml b/src/imports/controls/universal/SpinBox.qml index 417a62fe..ad0b7e6b 100644 --- a/src/imports/controls/universal/SpinBox.qml +++ b/src/imports/controls/universal/SpinBox.qml @@ -47,7 +47,7 @@ T.SpinBox { contentItem.implicitWidth + 16 + (up.indicator ? up.indicator.implicitWidth : 0) + (down.indicator ? down.indicator.implicitWidth : 0)) - implicitHeight: Math.max(contentItem.implicitHeight + topPadding + bottomPadding, + implicitHeight: Math.max(implicitContentHeight + topPadding + bottomPadding, implicitBackgroundHeight, up.indicator ? up.indicator.implicitHeight : 0, down.indicator ? down.indicator.implicitHeight : 0) diff --git a/src/imports/controls/universal/SwipeDelegate.qml b/src/imports/controls/universal/SwipeDelegate.qml index 8a649fe4..1e02d01e 100644 --- a/src/imports/controls/universal/SwipeDelegate.qml +++ b/src/imports/controls/universal/SwipeDelegate.qml @@ -44,9 +44,9 @@ T.SwipeDelegate { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) spacing: 12 diff --git a/src/imports/controls/universal/Switch.qml b/src/imports/controls/universal/Switch.qml index d87b9bee..ad208f13 100644 --- a/src/imports/controls/universal/Switch.qml +++ b/src/imports/controls/universal/Switch.qml @@ -43,9 +43,9 @@ T.Switch { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) padding: 5 diff --git a/src/imports/controls/universal/SwitchDelegate.qml b/src/imports/controls/universal/SwitchDelegate.qml index c80df33a..68a40b02 100644 --- a/src/imports/controls/universal/SwitchDelegate.qml +++ b/src/imports/controls/universal/SwitchDelegate.qml @@ -45,9 +45,9 @@ T.SwitchDelegate { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - Math.max(contentItem.implicitHeight, + Math.max(implicitContentHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) spacing: 12 diff --git a/src/imports/controls/universal/TabButton.qml b/src/imports/controls/universal/TabButton.qml index 4ed4135f..f4000dd9 100644 --- a/src/imports/controls/universal/TabButton.qml +++ b/src/imports/controls/universal/TabButton.qml @@ -44,9 +44,9 @@ T.TabButton { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) padding: 12 // PivotItemMargin spacing: 8 diff --git a/src/imports/controls/universal/ToolButton.qml b/src/imports/controls/universal/ToolButton.qml index 83c4202b..3e7902f8 100644 --- a/src/imports/controls/universal/ToolButton.qml +++ b/src/imports/controls/universal/ToolButton.qml @@ -44,9 +44,9 @@ T.ToolButton { id: control implicitWidth: Math.max(implicitBackgroundWidth, - contentItem.implicitWidth + leftPadding + rightPadding) + implicitContentWidth + leftPadding + rightPadding) implicitHeight: Math.max(implicitBackgroundHeight, - contentItem.implicitHeight + topPadding + bottomPadding) + implicitContentHeight + topPadding + bottomPadding) padding: 6 spacing: 8 diff --git a/src/imports/controls/universal/ToolSeparator.qml b/src/imports/controls/universal/ToolSeparator.qml index 6b5953ef..ad8d60e2 100644 --- a/src/imports/controls/universal/ToolSeparator.qml +++ b/src/imports/controls/universal/ToolSeparator.qml @@ -41,8 +41,8 @@ import QtQuick.Controls.Universal 2.5 T.ToolSeparator { id: control - implicitWidth: Math.max(implicitBackgroundWidth, contentItem.implicitWidth + leftPadding + rightPadding) - implicitHeight: Math.max(implicitBackgroundHeight, contentItem.implicitHeight + topPadding + bottomPadding) + implicitWidth: Math.max(implicitBackgroundWidth, implicitContentWidth + leftPadding + rightPadding) + implicitHeight: Math.max(implicitBackgroundHeight, implicitContentHeight + topPadding + bottomPadding) leftPadding: vertical ? 16 : 12 rightPadding: vertical ? 15 : 12 |