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/Slider.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/imports/controls/Slider.qml') diff --git a/src/imports/controls/Slider.qml b/src/imports/controls/Slider.qml index 32a1b90e..79792709 100644 --- a/src/imports/controls/Slider.qml +++ b/src/imports/controls/Slider.qml @@ -86,8 +86,8 @@ AbstractSlider { implicitHeight: horizontal ? 6 : 120 x: horizontal ? control.leftPadding : (control.width - width) / 2 y: horizontal ? (control.height - height) / 2 : control.topPadding - width: horizontal ? control.contentWidth : implicitWidth - height: horizontal ? implicitHeight : control.contentHeight + width: horizontal ? control.availableWidth : implicitWidth + height: horizontal ? implicitHeight : control.availableHeight radius: control.Theme.roundness border.color: control.Theme.frameColor -- cgit v1.2.3