From 9b67ed1dde437448b927ef839ca60a2820f021dc Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Thu, 18 Jun 2015 13:50:50 +0200 Subject: 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 --- src/imports/controls/RadioButton.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/imports/controls/RadioButton.qml') diff --git a/src/imports/controls/RadioButton.qml b/src/imports/controls/RadioButton.qml index ad3b246c..106b382e 100644 --- a/src/imports/controls/RadioButton.qml +++ b/src/imports/controls/RadioButton.qml @@ -87,8 +87,8 @@ AbstractRadioButton { 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 -- cgit v1.2.3