Fix issues with the label in GroupBox

1. Make it have the correct position, given by the labelPos
   property.
2. Put a Rectangle with the background color below the label to wipe
   away the frame strikethrough.

Change-Id: I68b6f1b5fda7854f7032dd9716613d025d2eb6ed
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>

1 files changed, 9 insertions, 0 deletions

diff --git a/src/imports/nativestyle/items/qquickstyleitemgroupbox.cpp b/src/imports/nativestyle/items/qquickstyleitemgroupbox.cpp
index 2b4154d2..d62b6f23 100644
--- a/src/imports/nativestyle/items/qquickstyleitemgroupbox.cpp
+++ b/src/imports/nativestyle/items/qquickstyleitemgroupbox.cpp
@@ -68,6 +68,10 @@ StyleItemGeometry QQuickStyleItemGroupBox::calculateGeometry()
     if (m_groupBoxPadding != oldGroupBoxPadding)
         emit groupBoxPaddingChanged();
 
+    const QPointF oldLabelPos = m_labelPos;
+    m_labelPos = style()->subControlRect(QStyle::CC_GroupBox, &styleOption, QStyle::SC_GroupBoxLabel).topLeft();
+    if (m_labelPos != oldLabelPos)
+        emit labelPosChanged();
     return geometry;
 }
 
@@ -89,3 +93,8 @@ QQuickStyleMargins QQuickStyleItemGroupBox::groupBoxPadding() const
 {
     return m_groupBoxPadding;
 }
+
+QPointF QQuickStyleItemGroupBox::labelPos() const
+{
+    return m_labelPos;
+}