feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fix the bug for overriding Final property

Browse Source 
Task-number: QDS-11301
Change-Id: I11a9941a344f7091405bd8e4cd5de10bf66c6c2e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Ali Kianian
2023-11-17 12:33:03 +02:00
parent 8932f9d462
commit 18461884e0
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
share/qtcreator/qmldesigner/collectionEditorQmlSource/CollectionItem.qml
View File

@@ -54,16 +54,16 @@ Item {
Text { Text {
id: moveTool id: moveTool
property StudioTheme.ControlStyle style: StudioTheme.Values.viewBarButtonStyle property StudioTheme.ControlStyle textStyle: StudioTheme.Values.viewBarButtonStyle
Layout.preferredWidth: moveTool.style.squareControlSize.width Layout.preferredWidth: moveTool.textStyle.squareControlSize.width
Layout.preferredHeight: nameHolder.height Layout.preferredHeight: nameHolder.height
Layout.leftMargin: 12 Layout.leftMargin: 12
Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter
text: StudioTheme.Constants.dragmarks text: StudioTheme.Constants.dragmarks
font.family: StudioTheme.Constants.iconFont.family font.family: StudioTheme.Constants.iconFont.family
font.pixelSize: moveTool.style.baseIconFontSize font.pixelSize: moveTool.textStyle.baseIconFontSize
color: root.textColor color: root.textColor
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter

4
share/qtcreator/qmldesigner/collectionEditorQmlSource/ModelSourceItem.qml
View File

@@ -74,9 +74,9 @@ Item {
Text { Text {
id: expandButton id: expandButton
property StudioTheme.ControlStyle style: StudioTheme.Values.viewBarButtonStyle property StudioTheme.ControlStyle textStyle: StudioTheme.Values.viewBarButtonStyle
Layout.preferredWidth: expandButton.style.squareControlSize.width Layout.preferredWidth: expandButton.textStyle.squareControlSize.width
Layout.preferredHeight: nameHolder.height Layout.preferredHeight: nameHolder.height
Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter Layout.alignment: Qt.AlignLeft | Qt.AlignVCenter

6
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/SectionLabel.qml
View File

@@ -9,11 +9,11 @@ import StudioTheme 1.0 as StudioTheme
T.Label { T.Label {
id: control id: control
property StudioTheme.ControlStyle style: StudioTheme.Values.controlStyle property StudioTheme.ControlStyle controlStyle: StudioTheme.Values.controlStyle
width: Math.max(Math.min(240, parent.width - 220), 90) width: Math.max(Math.min(240, parent.width - 220), 90)
color: control.style.text.idle color: control.controlStyle.text.idle
font.pixelSize: control.style.baseFontSize font.pixelSize: control.controlStyle.baseFontSize
elide: Text.ElideRight elide: Text.ElideRight
Layout.preferredWidth: width Layout.preferredWidth: width