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/ProgressBar.qml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/imports/controls/ProgressBar.qml') diff --git a/src/imports/controls/ProgressBar.qml b/src/imports/controls/ProgressBar.qml index 76f07f3c..6a6dfc11 100644 --- a/src/imports/controls/ProgressBar.qml +++ b/src/imports/controls/ProgressBar.qml @@ -53,8 +53,8 @@ AbstractProgressBar { indicator: Item { x: control.leftPadding y: control.topPadding - width: control.contentWidth - height: control.contentHeight + width: control.availableWidth + height: control.availableHeight scale: control.mirrored ? -1 : 1 @@ -95,7 +95,7 @@ AbstractProgressBar { implicitHeight: 6 x: control.leftPadding y: (parent.height - height) / 2 - width: control.contentWidth + width: control.availableWidth height: 6 radius: control.Theme.roundness -- cgit v1.2.3