diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-06-06 22:01:41 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@digia.com> | 2014-06-16 12:54:20 +0200 |
| commit | e7af888e86ddfd0f9b18b03f5ecbf8425fc5b0c0 (patch) | |
| tree | c67652d3a8994872b420f8fac47af26b117cfb23 /src | |
| parent | 09bc86d48895f4af6ae39d36c43fdbc1c0a7a28c (diff) | |
CheckBox & RadioButton: fix rounding issue that caused elided text
Task-number: QTBUG-39271
Change-Id: I9ddf03e2274f1abf4e049b84c3f72050f22cc958
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/controls/Styles/Desktop/CheckBoxStyle.qml | 2 | ||||
| -rw-r--r-- | src/controls/Styles/Desktop/RadioButtonStyle.qml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/controls/Styles/Desktop/CheckBoxStyle.qml b/src/controls/Styles/Desktop/CheckBoxStyle.qml index 9872a0148..7a4c46390 100644 --- a/src/controls/Styles/Desktop/CheckBoxStyle.qml +++ b/src/controls/Styles/Desktop/CheckBoxStyle.qml @@ -59,7 +59,7 @@ Style { hints: control.styleHints properties: {"partiallyChecked": (control.checkedState === Qt.PartiallyChecked) } contentHeight: textitem.implicitHeight - contentWidth: textitem.implicitWidth + 4 + contentWidth: Math.ceil(textitem.implicitWidth) + 4 property int indicatorWidth: pixelMetric("indicatorwidth") + (macStyle ? 2 : 4) property bool macStyle: (style === "mac") diff --git a/src/controls/Styles/Desktop/RadioButtonStyle.qml b/src/controls/Styles/Desktop/RadioButtonStyle.qml index 8d4c0b2a5..2babc77c7 100644 --- a/src/controls/Styles/Desktop/RadioButtonStyle.qml +++ b/src/controls/Styles/Desktop/RadioButtonStyle.qml @@ -62,7 +62,7 @@ Style { hasFocus: control.activeFocus && styleitem.style == "mac" hints: control.styleHints contentHeight: textitem.implicitHeight - contentWidth: textitem.implicitWidth + 4 + contentWidth: Math.ceil(textitem.implicitWidth) + 4 property int indicatorWidth: pixelMetric("indicatorwidth") + (macStyle ? 2 : 4) property bool macStyle: (style === "mac") |