diff options
author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-06-03 17:02:20 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-06-03 16:29:19 +0000 |
commit | fff6239d2f98b41f4ef003f06f356fb0730f9d57 (patch) | |
tree | 4d1d5512b6e19d88e99e5ff79d0ea781fab52d17 /src/imports | |
parent | f0ceecaf0b51809a076ed0add159c95cada528bf (diff) |
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 <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/imports')
-rw-r--r-- | src/imports/controls/Button.qml | 4 |
1 files changed, 2 insertions, 2 deletions
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 |