aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls/ToggleButton.qml
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2015-06-18 13:50:50 +0200
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2015-06-18 12:37:24 +0000
commit9b67ed1dde437448b927ef839ca60a2820f021dc (patch)
treea3449d0916da7107a7e93bc053cf54ab24f68b4b /src/imports/controls/ToggleButton.qml
parentfc8d59cf737b1ea1afb4348fdfd3f3dba676966d (diff)
Revert "Rename Control::availableWidth/Height to contentWidth/Height"
TextField and TextArea have different semantics for contentWidth and contentHeight. In addition, it looks like we need to restore contentWidth and contentHeight for Frame & GroupBox. This reverts commit 6941b934bdf5f3c7b65f682c8dfc5c6562292351. Change-Id: Ia115025a67b472ac67fbbc915b80312e4b4a7431 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/ToggleButton.qml')
-rw-r--r--src/imports/controls/ToggleButton.qml4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/controls/ToggleButton.qml b/src/imports/controls/ToggleButton.qml
index 84d9f3df..1655a317 100644
--- a/src/imports/controls/ToggleButton.qml
+++ b/src/imports/controls/ToggleButton.qml
@@ -95,8 +95,8 @@ AbstractToggleButton {
label: Text {
x: control.mirrored ? control.leftPadding : (indicator.x + indicator.width + control.Theme.spacing)
y: control.topPadding
- width: control.contentWidth - indicator.width - control.Theme.spacing
- height: control.contentHeight
+ width: control.availableWidth - indicator.width - control.Theme.spacing
+ height: control.availableHeight
text: control.text
color: control.enabled ? control.Theme.textColor : control.Theme.disabledColor