From fff6239d2f98b41f4ef003f06f356fb0730f9d57 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Wed, 3 Jun 2015 17:02:20 +0200 Subject: Control::availableWidth & availableHeight The recently introduced contentWidth/Height was ambiguous. It had even different semantics than in Containers, TextXxx & Flickable etc. Thus, replace with availableWidth/Height. Change-Id: Iaeef25ec82b395c602724d222ca73666460ffd29 Reviewed-by: J-P Nurmi --- src/imports/controls/Button.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/imports/controls') diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml index c0c4033c..899b3d3c 100644 --- a/src/imports/controls/Button.qml +++ b/src/imports/controls/Button.qml @@ -55,8 +55,8 @@ AbstractButton { label: Text { x: control.leftPadding y: control.topPadding - width: control.contentWidth - height: control.contentHeight + width: control.availableWidth + height: control.availableHeight text: control.text color: control.Theme.selectedTextColor -- cgit v1.2.3