Add missing focus rect to check box and radio button

Only mac style actually indicated focus as we depend on a
focus rect around the text label for other styles.

Bonus fix: When setting the width of the check box
we would still use the implicit width in the style which
meant that items would overlap incorrectly

Change-Id: Ibb4dc92633fbc5fb200a35d1c0b04a297c7f8f42
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>

src/private/qquickstyleitem.cpp

@@ -357,6 +357,13 @@ void QQuickStyleItem::initStyleOption()
         opt->midLineWidth = 1;
     }
         break;
+    case FocusRect: {
+        if (!m_styleoption)
+            m_styleoption = new QStyleOptionFocusRect();
+        // Needed on windows
+        m_styleoption->state |= QStyle::State_KeyboardFocusChange;
+    }
+        break;
     case TabFrame: {
         if (!m_styleoption)
             m_styleoption = new QStyleOptionTabWidgetFrame();
@@ -1043,6 +1050,8 @@ void QQuickStyleItem::setElementType(const QString &str)
         m_itemType = Widget;
     } else if (str == "focusframe") {
         m_itemType = FocusFrame;
+    } else if (str == "focusrect") {
+        m_itemType = FocusRect;
     } else if (str == "dial") {
         m_itemType = Dial;
     } else if (str == "statusbar") {
@@ -1249,6 +1258,9 @@ void QQuickStyleItem::paint(QPainter *painter)
 #endif
             qApp->style()->drawControl(QStyle::CE_FocusFrame, m_styleoption, painter);
         break;
+    case FocusRect:
+        qApp->style()->drawPrimitive(QStyle::PE_FrameFocusRect, m_styleoption, painter);
+        break;
     case TabFrame:
         qApp->style()->drawPrimitive(QStyle::PE_FrameTabWidget, m_styleoption, painter);
         break;

src/private/qquickstyleitem_p.h

@@ -99,6 +99,7 @@ public:
         TabFrame,
         Frame,
         FocusFrame,
+        FocusRect,
         SpinBox,
         Slider,
         ScrollBar,

src/styles/Desktop/CheckBoxStyle.qml

@@ -54,7 +54,7 @@ Style {
             on: control.checked || control.pressed
             hover: control.__containsMouse
             enabled: control.enabled
-            hasFocus: control.activeFocus
+            hasFocus: control.activeFocus && styleitem.style == "mac"
             hints: {
                 if (control.checkedState === Qt.PartiallyChecked)
                     control.styleHints.push("partiallyChecked");
@@ -82,6 +82,16 @@ Style {
                 elide: Text.ElideRight
                 enabled: control.enabled
                 color: __syspal.windowText
+                StyleItem {
+                    elementType: "focusrect"
+                    anchors.margins: -1
+                    anchors.leftMargin: -2
+                    anchors.top: parent.top
+                    anchors.left: parent.left
+                    anchors.bottom: parent.bottom
+                    width: textitem.implicitWidth + 3
+                    visible: control.activeFocus
+                }
             }
         }
     }

src/styles/Desktop/RadioButtonStyle.qml

@@ -58,7 +58,7 @@ Style {
             on: control.checked || control.pressed
             hover: control.__containsMouse
             enabled: control.enabled
-            hasFocus: control.activeFocus
+            hasFocus: control.activeFocus && styleitem.style == "mac"
             hints: control.styleHints
             contentHeight: textitem.implicitHeight
             contentWidth: textitem.implicitWidth + indicatorWidth
@@ -77,6 +77,16 @@ Style {
                 elide: Text.ElideRight
                 enabled: control.enabled
                 color: __syspal.windowText
+                StyleItem {
+                    elementType: "focusrect"
+                    anchors.margins: -1
+                    anchors.leftMargin: -2
+                    anchors.top: parent.top
+                    anchors.left: parent.left
+                    anchors.bottom: parent.bottom
+                    width: textitem.implicitWidth + 3
+                    visible: control.activeFocus
+                }
             }
         }
     }