aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/material
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2018-04-13 13:09:30 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2018-04-13 13:52:59 +0000
commit704625a034270739e886a28bfa6e8889c8ad984b (patch)
treea17f37a7a3bb24b2ef313590b0673a5b248bb76e /src/imports/controls/material
parentb4334eed2fd6b5c33dcd464e44c3966deaca2276 (diff)
AbstractButton: add implicitIndicatorWidth|Height
[ChangeLog][Controls][AbstractButton] Added implicitIndicatorWidth and implicitIndicatorHeight properties. Change-Id: Ic9459efa76c12ba0df67dae0ffe103b14e011ee6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/imports/controls/material')
-rw-r--r--src/imports/controls/material/CheckBox.qml2
-rw-r--r--src/imports/controls/material/CheckDelegate.qml2
-rw-r--r--src/imports/controls/material/ItemDelegate.qml2
-rw-r--r--src/imports/controls/material/MenuItem.qml2
-rw-r--r--src/imports/controls/material/RadioButton.qml2
-rw-r--r--src/imports/controls/material/RadioDelegate.qml2
-rw-r--r--src/imports/controls/material/SwipeDelegate.qml2
-rw-r--r--src/imports/controls/material/Switch.qml2
-rw-r--r--src/imports/controls/material/SwitchDelegate.qml2
9 files changed, 9 insertions, 9 deletions
diff --git a/src/imports/controls/material/CheckBox.qml b/src/imports/controls/material/CheckBox.qml
index d829f842..45191da6 100644
--- a/src/imports/controls/material/CheckBox.qml
+++ b/src/imports/controls/material/CheckBox.qml
@@ -46,7 +46,7 @@ T.CheckBox {
implicitContentWidth + leftPadding + rightPadding)
implicitHeight: Math.max(implicitBackgroundHeight,
Math.max(implicitContentHeight,
- indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)
+ implicitIndicatorHeight) + topPadding + bottomPadding)
spacing: 8
padding: 8
diff --git a/src/imports/controls/material/CheckDelegate.qml b/src/imports/controls/material/CheckDelegate.qml
index 66e76e0e..429ce84f 100644
--- a/src/imports/controls/material/CheckDelegate.qml
+++ b/src/imports/controls/material/CheckDelegate.qml
@@ -48,7 +48,7 @@ T.CheckDelegate {
implicitContentWidth + leftPadding + rightPadding)
implicitHeight: Math.max(implicitBackgroundHeight,
Math.max(implicitContentHeight,
- indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)
+ implicitIndicatorHeight) + topPadding + bottomPadding)
padding: 16
verticalPadding: 8
diff --git a/src/imports/controls/material/ItemDelegate.qml b/src/imports/controls/material/ItemDelegate.qml
index abc4f5ac..072aea71 100644
--- a/src/imports/controls/material/ItemDelegate.qml
+++ b/src/imports/controls/material/ItemDelegate.qml
@@ -48,7 +48,7 @@ T.ItemDelegate {
implicitContentWidth + leftPadding + rightPadding)
implicitHeight: Math.max(implicitBackgroundHeight,
Math.max(implicitContentHeight,
- indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)
+ implicitIndicatorHeight) + topPadding + bottomPadding)
padding: 16
verticalPadding: 8
diff --git a/src/imports/controls/material/MenuItem.qml b/src/imports/controls/material/MenuItem.qml
index 7ae0e103..fb5f7055 100644
--- a/src/imports/controls/material/MenuItem.qml
+++ b/src/imports/controls/material/MenuItem.qml
@@ -48,7 +48,7 @@ T.MenuItem {
implicitContentWidth + leftPadding + rightPadding)
implicitHeight: Math.max(implicitBackgroundHeight,
Math.max(implicitContentHeight,
- indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)
+ implicitIndicatorHeight) + topPadding + bottomPadding)
padding: 16
verticalPadding: Material.menuItemVerticalPadding
diff --git a/src/imports/controls/material/RadioButton.qml b/src/imports/controls/material/RadioButton.qml
index b7744a85..f6dc6100 100644
--- a/src/imports/controls/material/RadioButton.qml
+++ b/src/imports/controls/material/RadioButton.qml
@@ -46,7 +46,7 @@ T.RadioButton {
implicitContentWidth + leftPadding + rightPadding)
implicitHeight: Math.max(implicitBackgroundHeight,
Math.max(implicitContentHeight,
- indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)
+ implicitIndicatorHeight) + topPadding + bottomPadding)
spacing: 8
padding: 8
diff --git a/src/imports/controls/material/RadioDelegate.qml b/src/imports/controls/material/RadioDelegate.qml
index bec8f64b..cce9a519 100644
--- a/src/imports/controls/material/RadioDelegate.qml
+++ b/src/imports/controls/material/RadioDelegate.qml
@@ -48,7 +48,7 @@ T.RadioDelegate {
implicitContentWidth + leftPadding + rightPadding)
implicitHeight: Math.max(implicitBackgroundHeight,
Math.max(implicitContentHeight,
- indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)
+ implicitIndicatorHeight) + topPadding + bottomPadding)
padding: 16
verticalPadding: 8
diff --git a/src/imports/controls/material/SwipeDelegate.qml b/src/imports/controls/material/SwipeDelegate.qml
index fc4dbc20..cf555caa 100644
--- a/src/imports/controls/material/SwipeDelegate.qml
+++ b/src/imports/controls/material/SwipeDelegate.qml
@@ -48,7 +48,7 @@ T.SwipeDelegate {
implicitContentWidth + leftPadding + rightPadding)
implicitHeight: Math.max(implicitBackgroundHeight,
Math.max(implicitContentHeight,
- indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)
+ implicitIndicatorHeight) + topPadding + bottomPadding)
padding: 16
verticalPadding: 8
diff --git a/src/imports/controls/material/Switch.qml b/src/imports/controls/material/Switch.qml
index c595465d..7886442c 100644
--- a/src/imports/controls/material/Switch.qml
+++ b/src/imports/controls/material/Switch.qml
@@ -46,7 +46,7 @@ T.Switch {
implicitContentWidth + leftPadding + rightPadding)
implicitHeight: Math.max(implicitBackgroundHeight,
Math.max(implicitContentHeight,
- indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)
+ implicitIndicatorHeight) + topPadding + bottomPadding)
padding: 8
spacing: 8
diff --git a/src/imports/controls/material/SwitchDelegate.qml b/src/imports/controls/material/SwitchDelegate.qml
index 0e62ea7d..077901b6 100644
--- a/src/imports/controls/material/SwitchDelegate.qml
+++ b/src/imports/controls/material/SwitchDelegate.qml
@@ -48,7 +48,7 @@ T.SwitchDelegate {
implicitContentWidth + leftPadding + rightPadding)
implicitHeight: Math.max(implicitBackgroundHeight,
Math.max(implicitContentHeight,
- indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding)
+ implicitIndicatorHeight) + topPadding + bottomPadding)
padding: 16
verticalPadding: Material.switchDelegateVerticalPadding