diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-11-25 01:04:19 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-11-25 08:53:45 +0000 |
| commit | 6980589344b67f6a68e5fa86d3ea89d9f659d842 (patch) | |
| tree | 9cb7636e2a45ce429436cac99808189ccb95c856 /src/imports/controls/universal | |
| parent | 96474dba254526b48e35ffa5b22950185dae43fb (diff) | |
Specify baseline offsets
Change-Id: I4845a7beac2edc0f0bcc1c810edd7d9e86f31c87
Task-number: QTBUG-49468
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/universal')
| -rw-r--r-- | src/imports/controls/universal/Button.qml | 1 | ||||
| -rw-r--r-- | src/imports/controls/universal/CheckBox.qml | 1 | ||||
| -rw-r--r-- | src/imports/controls/universal/RadioButton.qml | 1 | ||||
| -rw-r--r-- | src/imports/controls/universal/Switch.qml | 1 | ||||
| -rw-r--r-- | src/imports/controls/universal/TabButton.qml | 1 | ||||
| -rw-r--r-- | src/imports/controls/universal/ToolButton.qml | 1 |
6 files changed, 6 insertions, 0 deletions
diff --git a/src/imports/controls/universal/Button.qml b/src/imports/controls/universal/Button.qml index b84dc61a..d8e988a7 100644 --- a/src/imports/controls/universal/Button.qml +++ b/src/imports/controls/universal/Button.qml @@ -45,6 +45,7 @@ T.Button { label ? label.implicitWidth + leftPadding + rightPadding : 0) implicitHeight: Math.max(background ? background.implicitHeight : 0, label ? label.implicitHeight + topPadding + bottomPadding : 0) + baselineOffset: label ? label.y + label.baselineOffset : 0 topPadding: 4 leftPadding: 8 diff --git a/src/imports/controls/universal/CheckBox.qml b/src/imports/controls/universal/CheckBox.qml index 5feba9db..325b9872 100644 --- a/src/imports/controls/universal/CheckBox.qml +++ b/src/imports/controls/universal/CheckBox.qml @@ -48,6 +48,7 @@ T.CheckBox { implicitHeight: Math.max(background ? background.implicitHeight : 0, Math.max(label ? label.implicitHeight : 0, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: label ? label.y + label.baselineOffset : 0 padding: 6 spacing: 8 diff --git a/src/imports/controls/universal/RadioButton.qml b/src/imports/controls/universal/RadioButton.qml index 30607ec0..e09f0079 100644 --- a/src/imports/controls/universal/RadioButton.qml +++ b/src/imports/controls/universal/RadioButton.qml @@ -48,6 +48,7 @@ T.RadioButton { implicitHeight: Math.max(background ? background.implicitHeight : 0, Math.max(label ? label.implicitHeight : 0, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: label ? label.y + label.baselineOffset : 0 padding: 6 spacing: 8 diff --git a/src/imports/controls/universal/Switch.qml b/src/imports/controls/universal/Switch.qml index 5a28b031..f8d03333 100644 --- a/src/imports/controls/universal/Switch.qml +++ b/src/imports/controls/universal/Switch.qml @@ -48,6 +48,7 @@ T.Switch { implicitHeight: Math.max(background ? background.implicitHeight : 0, Math.max(label ? label.implicitHeight : 0, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + baselineOffset: label ? label.y + label.baselineOffset : 0 padding: 5 spacing: 8 diff --git a/src/imports/controls/universal/TabButton.qml b/src/imports/controls/universal/TabButton.qml index 667aecbf..a750db22 100644 --- a/src/imports/controls/universal/TabButton.qml +++ b/src/imports/controls/universal/TabButton.qml @@ -45,6 +45,7 @@ T.TabButton { label ? label.implicitWidth + leftPadding + rightPadding : 0) implicitHeight: Math.max(background ? background.implicitHeight : 0, label ? label.implicitHeight + topPadding + bottomPadding : 0) + baselineOffset: label ? label.y + label.baselineOffset : 0 padding: 12 // PivotItemMargin diff --git a/src/imports/controls/universal/ToolButton.qml b/src/imports/controls/universal/ToolButton.qml index f4a2b3c8..369caa90 100644 --- a/src/imports/controls/universal/ToolButton.qml +++ b/src/imports/controls/universal/ToolButton.qml @@ -45,6 +45,7 @@ T.ToolButton { label ? label.implicitWidth + leftPadding + rightPadding : 0) implicitHeight: Math.max(background ? background.implicitHeight : 0, label ? label.implicitHeight + topPadding + bottomPadding : 0) + baselineOffset: label ? label.y + label.baselineOffset : 0 padding: 6 |