From ab71cd2439dba00c751becd91dcf111b8ec38ba9 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Sat, 23 May 2015 10:57:02 +0200 Subject: Button: revert automatic label layouting It got ugly and hackish, and broke for QQuickButton subclasses. Instead, use simple and pretty bindings (thanks to newly introduced contentWidth and contentHeight) to give the label a default size and position. Change-Id: I4cd705e86a12e8c9ffa0b7a768b1878bba797036 Reviewed-by: J-P Nurmi --- src/imports/controls/Button.qml | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/imports/controls') diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml index 708dc845..c0c4033c 100644 --- a/src/imports/controls/Button.qml +++ b/src/imports/controls/Button.qml @@ -53,6 +53,11 @@ AbstractButton { //! [label] label: Text { + x: control.leftPadding + y: control.topPadding + width: control.contentWidth + height: control.contentHeight + text: control.text color: control.Theme.selectedTextColor horizontalAlignment: Text.AlignHCenter -- cgit v1.2.3