aboutsummaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorHenning Gruendl <henning.gruendl@qt.io>2019-08-06 15:12:18 +0200
committerHenning Gründl <henning.gruendl@qt.io>2019-08-06 13:21:22 +0000
commitf10adce9c8169be3d166b8a2237860711305e7a2 (patch)
treebbead27e3e26f289adb1aed1d2349bc2f7c74ba6 /share
parenta8e3ae38cb2cf71c8a9883e0a12222af12c90211 (diff)
QmlDesigner: Change CheckBox label position
Change-Id: I491f32ff97ed540def95ea30ebdaa729b5d68c4f Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'share')
-rw-r--r--share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/CheckBox.qml25
1 files changed, 11 insertions, 14 deletions
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/CheckBox.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/CheckBox.qml
index 5ec29bbe2e..0faaf7e0a8 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/CheckBox.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/CheckBox.qml
@@ -57,23 +57,9 @@ T.CheckBox {
hoverEnabled: true
activeFocusOnTab: false
- contentItem: T.Label {
- id: checkBoxLabel
- leftPadding: 0
- rightPadding: 0
- verticalAlignment: Text.AlignVCenter
- text: myCheckBox.text
- font: myCheckBox.font
- color: StudioTheme.Values.themeTextColor
- visible: text !== ""
- }
-
ActionIndicator {
id: actionIndicator
myControl: myCheckBox // TODO global hover issue. Can be solved with extra property in ActionIndicator
-
- x: checkBoxLabel.visible ? checkBoxLabel.contentWidth + myCheckBox.spacing : 0
- y: 0
width: actionIndicator.visible ? __actionIndicatorWidth : 0
height: actionIndicator.visible ? __actionIndicatorHeight : 0
}
@@ -113,6 +99,17 @@ T.CheckBox {
}
}
+ contentItem: T.Label {
+ id: checkBoxLabel
+ leftPadding: checkBoxBackground.x + checkBoxBackground.width + myCheckBox.spacing
+ rightPadding: 0
+ verticalAlignment: Text.AlignVCenter
+ text: myCheckBox.text
+ font: myCheckBox.font
+ color: StudioTheme.Values.themeTextColor
+ visible: text !== ""
+ }
+
states: [
State {
name: "default"