diff --git a/src/controls/Styles/Android/SwitchStyle.qml b/src/controls/Styles/Android/SwitchStyle.qml index 4c36c918e6de467e6466485de9c4f62c7e0fdb1c..8401d3535e5b91d8cc2ea2b8a3f6d4da97db3ff7 100644 --- a/src/controls/Styles/Android/SwitchStyle.qml +++ b/src/controls/Styles/Android/SwitchStyle.qml @@ -81,16 +81,22 @@ SwitchStyle { x: control.checked ? max : min - FontMetrics { - id: metrics + TextMetrics { + id: onMetrics font: label.font + text: panel.styleDef.Switch_textOn } - readonly property real maxTextWidth: Math.max(metrics.boundingRect(panel.styleDef.Switch_textOn).width, - metrics.boundingRect(panel.styleDef.Switch_textOff).width) + TextMetrics { + id: offMetrics + font: label.font + text: panel.styleDef.Switch_textOff + } + + readonly property real maxTextWidth: Math.max(onMetrics.width, offMetrics.width) implicitWidth: Math.max(loader.implicitWidth, maxTextWidth + 2 * panel.styleDef.Switch_thumbTextPadding) - implicitHeight: Math.max(loader.implicitHeight, metrics.height) + implicitHeight: Math.max(loader.implicitHeight, onMetrics.height, offMetrics.height) anchors.top: parent.top anchors.bottom: parent.bottom