Specify baseline offsets

Change-Id: I4845a7beac2edc0f0bcc1c810edd7d9e86f31c87
Task-number: QTBUG-49468
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>

24 files changed, 65 insertions, 0 deletions

diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml
index cd725298..cc7a65b8 100644
--- a/src/imports/controls/Button.qml
+++ b/src/imports/controls/Button.qml
@@ -44,6 +44,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
 
     padding: 6
     leftPadding: 8
diff --git a/src/imports/controls/CheckBox.qml b/src/imports/controls/CheckBox.qml
index 254c4d10..5eb7696e 100644
--- a/src/imports/controls/CheckBox.qml
+++ b/src/imports/controls/CheckBox.qml
@@ -47,6 +47,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: 6
diff --git a/src/imports/controls/RadioButton.qml b/src/imports/controls/RadioButton.qml
index 83a8359e..66c88118 100644
--- a/src/imports/controls/RadioButton.qml
+++ b/src/imports/controls/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: 6
diff --git a/src/imports/controls/Switch.qml b/src/imports/controls/Switch.qml
index cea3c53a..3e224383 100644
--- a/src/imports/controls/Switch.qml
+++ b/src/imports/controls/Switch.qml
@@ -47,6 +47,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: 6
     spacing: 6
diff --git a/src/imports/controls/TabButton.qml b/src/imports/controls/TabButton.qml
index fc95b8a8..1fbb6050 100644
--- a/src/imports/controls/TabButton.qml
+++ b/src/imports/controls/TabButton.qml
@@ -44,6 +44,7 @@ T.TabButton {
                             label ? label.contentWidth + leftPadding + rightPadding : 0)
     implicitHeight: Math.max(background ? background.implicitHeight : 0,
                              label ? label.contentHeight + topPadding + bottomPadding : 0)
+    baselineOffset: label ? label.y + label.baselineOffset : 0
 
     padding: 6
 
diff --git a/src/imports/controls/ToolButton.qml b/src/imports/controls/ToolButton.qml
index b6d33549..ecaad9a0 100644
--- a/src/imports/controls/ToolButton.qml
+++ b/src/imports/controls/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
 
diff --git a/src/imports/controls/material/Button.qml b/src/imports/controls/material/Button.qml
index 5275343f..6d2ab499 100644
--- a/src/imports/controls/material/Button.qml
+++ b/src/imports/controls/material/Button.qml
@@ -46,6 +46,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
 
     padding: 6
     leftPadding: 8
diff --git a/src/imports/controls/material/CheckBox.qml b/src/imports/controls/material/CheckBox.qml
index 9dbf5466..5884a64e 100644
--- a/src/imports/controls/material/CheckBox.qml
+++ b/src/imports/controls/material/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: 6
diff --git a/src/imports/controls/material/RadioButton.qml b/src/imports/controls/material/RadioButton.qml
index 4e07e0e4..96605311 100644
--- a/src/imports/controls/material/RadioButton.qml
+++ b/src/imports/controls/material/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: 6
diff --git a/src/imports/controls/material/Switch.qml b/src/imports/controls/material/Switch.qml
index 75aeb566..6e612d40 100644
--- a/src/imports/controls/material/Switch.qml
+++ b/src/imports/controls/material/Switch.qml
@@ -49,6 +49,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: 6
     spacing: 6
diff --git a/src/imports/controls/material/TabButton.qml b/src/imports/controls/material/TabButton.qml
index 62bf4bb7..c5b2472a 100644
--- a/src/imports/controls/material/TabButton.qml
+++ b/src/imports/controls/material/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: 6
 
diff --git a/src/imports/controls/material/ToolButton.qml b/src/imports/controls/material/ToolButton.qml
index 5f422e32..4f72f4ef 100644
--- a/src/imports/controls/material/ToolButton.qml
+++ b/src/imports/controls/material/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
 
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
 
diff --git a/tests/auto/controls/data/tst_button.qml b/tests/auto/controls/data/tst_button.qml
index b5b37156..873009e8 100644
--- a/tests/auto/controls/data/tst_button.qml
+++ b/tests/auto/controls/data/tst_button.qml
@@ -299,4 +299,11 @@ TestCase {
         control.highlighted = true
         compare(control.highlighted, true)
     }
+
+    function test_baseline() {
+        var control = button.createObject(testCase)
+        verify(control)
+        compare(control.baselineOffset, control.label.y + control.label.baselineOffset)
+        control.destroy()
+    }
 }
diff --git a/tests/auto/controls/data/tst_checkbox.qml b/tests/auto/controls/data/tst_checkbox.qml
index c61cab38..4efc7223 100644
--- a/tests/auto/controls/data/tst_checkbox.qml
+++ b/tests/auto/controls/data/tst_checkbox.qml
@@ -417,4 +417,11 @@ TestCase {
 
         control.destroy()
     }
+
+    function test_baseline() {
+        var control = checkBox.createObject(testCase)
+        verify(control)
+        compare(control.baselineOffset, control.label.y + control.label.baselineOffset)
+        control.destroy()
+    }
 }
diff --git a/tests/auto/controls/data/tst_radiobutton.qml b/tests/auto/controls/data/tst_radiobutton.qml
index df6834fe..d4cdf0ad 100644
--- a/tests/auto/controls/data/tst_radiobutton.qml
+++ b/tests/auto/controls/data/tst_radiobutton.qml
@@ -308,4 +308,11 @@ TestCase {
 
         container.destroy()
     }
+
+    function test_baseline() {
+        var control = radioButton.createObject(testCase)
+        verify(control)
+        compare(control.baselineOffset, control.label.y + control.label.baselineOffset)
+        control.destroy()
+    }
 }
diff --git a/tests/auto/controls/data/tst_switch.qml b/tests/auto/controls/data/tst_switch.qml
index 153a28b9..13924ed0 100644
--- a/tests/auto/controls/data/tst_switch.qml
+++ b/tests/auto/controls/data/tst_switch.qml
@@ -256,4 +256,11 @@ TestCase {
 
         container.destroy()
     }
+
+    function test_baseline() {
+        var control = swtch.createObject(testCase)
+        verify(control)
+        compare(control.baselineOffset, control.label.y + control.label.baselineOffset)
+        control.destroy()
+    }
 }
diff --git a/tests/auto/controls/data/tst_tabbutton.qml b/tests/auto/controls/data/tst_tabbutton.qml
index da9e094b..3a817cfd 100644
--- a/tests/auto/controls/data/tst_tabbutton.qml
+++ b/tests/auto/controls/data/tst_tabbutton.qml
@@ -51,6 +51,11 @@ TestCase {
     name: "TabButton"
 
     Component {
+        id: tabButton
+        TabButton { }
+    }
+
+    Component {
         id: repeater
         Column {
             Repeater {
@@ -76,4 +81,11 @@ TestCase {
 
         container.destroy()
     }
+
+    function test_baseline() {
+        var control = tabButton.createObject(testCase)
+        verify(control)
+        compare(control.baselineOffset, control.label.y + control.label.baselineOffset)
+        control.destroy()
+    }
 }
diff --git a/tests/auto/controls/data/tst_toolbutton.qml b/tests/auto/controls/data/tst_toolbutton.qml
index 5dfac358..63a87ec2 100644
--- a/tests/auto/controls/data/tst_toolbutton.qml
+++ b/tests/auto/controls/data/tst_toolbutton.qml
@@ -169,4 +169,11 @@ TestCase {
 
         control.destroy()
     }
+
+    function test_baseline() {
+        var control = toolButton.createObject(testCase)
+        verify(control)
+        compare(control.baselineOffset, control.label.y + control.label.baselineOffset)
+        control.destroy()
+    }
 }