From aceaa093f90fd006e5b2d9523b8ed6cab7b8577d Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Mon, 2 Mar 2015 18:42:28 +0100 Subject: Update src/imports to use top/left/right/bottomPadding Change-Id: I9c72db2d8f44429a7c87baaad663b88c7e1f1bb9 Reviewed-by: Jari-Pekka Nurmi --- src/imports/controls/TabButton.qml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'src/imports/controls/TabButton.qml') diff --git a/src/imports/controls/TabButton.qml b/src/imports/controls/TabButton.qml index 3676a4bc..e1621c85 100644 --- a/src/imports/controls/TabButton.qml +++ b/src/imports/controls/TabButton.qml @@ -41,22 +41,25 @@ AbstractTabButton { id: control implicitWidth: Math.max(background ? background.implicitWidth : 0, - label ? label.implicitWidth + padding.left + padding.right : 0) + label ? label.implicitWidth + leftPadding + rightPadding : 0) implicitHeight: Math.max(background ? background.implicitHeight : 0, - label ? label.implicitHeight + padding.top + padding.bottom : 0) + label ? label.implicitHeight + topPadding + bottomPadding : 0) Accessible.name: text Accessible.pressed: pressed Accessible.selected: checked Accessible.role: Accessible.PageTab - padding { top: style.padding; left: style.padding; right: style.padding; bottom: style.padding } + topPadding: style.padding + leftPadding: style.padding + rightPadding: style.padding + bottomPadding: style.padding label: Text { - x: padding.left - y: padding.top - width: parent.width - padding.left - padding.right - height: parent.height - padding.top - padding.bottom + x: control.leftPadding + y: control.topPadding + width: parent.width - control.leftPadding - control.rightPadding + height: parent.height - control.topPadding - control.bottomPadding text: control.text font.pointSize: 10 -- cgit v1.2.3