diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-06-18 13:50:50 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-06-18 12:37:24 +0000 |
| commit | 9b67ed1dde437448b927ef839ca60a2820f021dc (patch) | |
| tree | a3449d0916da7107a7e93bc053cf54ab24f68b4b /src/imports/controls/Slider.qml | |
| parent | fc8d59cf737b1ea1afb4348fdfd3f3dba676966d (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/Slider.qml')
| -rw-r--r-- | src/imports/controls/Slider.qml | 4 |
1 files changed, 2 insertions, 2 deletions
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 |