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

QmlDesigner: Fix a few warnings and errors

Browse Source 
Change-Id: Ie25fdc100a8288cd1b10ee186ab925c0ed13ee2d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Henning Gruendl
2021-06-24 15:41:07 +02:00
committed by Tim Jenssen
parent 18f9a69f29
commit d5544c7aba
5 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/Button.qml
View File

@@ -80,8 +80,8 @@ T.AbstractButton {
when: myButton.hovered && myButton.pressed
PropertyChanges {
target: buttonBackground
color: StudioTheme.Values.themeControlBackgroundPressed
border.color: StudioTheme.Values.themeInteraction
color: StudioTheme.Values.themeControlBackgroundInteraction
border.color: StudioTheme.Values.themeControlOutlineInteraction
}
},
State {

2
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientPresetTabContent.qml
View File

@@ -145,7 +145,7 @@ Rectangle {
target: backgroundCard
color:StudioTheme.Values.themeInteraction
border.width: StudioTheme.Values.border
border.color: StudioTheme.Values.themeControlBackgroundPressed
border.color: StudioTheme.Values.themeControlOutlineInteraction
}
}
]

2
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/OriginControl.qml
View File

@@ -52,7 +52,7 @@ Row {
if (enumString === "")
enumString = root.backendValue.value
root.origin = enumString
root.origin = enumString === undefined ? "Center" : enumString
}
}

8
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/OriginSelector.qml
View File

@@ -48,7 +48,7 @@ Rectangle {
states: [
State {
name: "default"
when: !mouseArea.containsMouse && !mouseArea.pressed && myControl.origin !== value
when: !mouseArea.containsMouse && !mouseArea.pressed && myControl.origin !== root.value
PropertyChanges {
target: root
color: StudioTheme.Values.themeTextColorDisabled // TODO
@@ -56,7 +56,7 @@ Rectangle {
},
State {
name: "hover"
when: mouseArea.containsMouse && !mouseArea.pressed && myControl.origin !== value
when: mouseArea.containsMouse && !mouseArea.pressed && myControl.origin !== root.value
PropertyChanges {
target: root
color: StudioTheme.Values.themeControlBackgroundInteraction // TODO
@@ -64,7 +64,7 @@ Rectangle {
},
State {
name: "press"
when: mouseArea.containsPress && myControl.origin !== enumValue
when: mouseArea.containsPress && myControl.origin !== root.value
PropertyChanges {
target: root
color: StudioTheme.Values.themeControlBackgroundInteraction // TODO
@@ -73,7 +73,7 @@ Rectangle {
},
State {
name: "active"
when: myControl.origin === value
when: myControl.origin === root.value
PropertyChanges {
target: root
color: StudioTheme.Values.themeInteraction

22
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/SpinBox.qml
View File

@@ -46,18 +46,18 @@ Item {
implicitHeight: spinBox.height
onFocusChanged: {
restoreCursor();
transaction.end();
restoreCursor()
transaction.end()
}
Component.onCompleted: {
spinBox.enabled = !isBlocked(backendValue.name);
spinBox.enabled = backendValue === undefined ? false : !isBlocked(backendValue.name)
}
Connections {
target: modelNodeBackend
function onSelectionChanged() {
spinBox.enabled = !isBlocked(backendValue.name);
spinBox.enabled = backendValue === undefined ? false : !isBlocked(backendValue.name)
}
}
@@ -65,25 +65,25 @@ Item {
id: spinBox
onDragStarted: {
hideCursor();
transaction.start();
hideCursor()
transaction.start()
}
onDragEnded: {
restoreCursor();
transaction.end();
restoreCursor()
transaction.end()
}
onDragging: holdCursorInPlace();
onDragging: holdCursorInPlace()
onRealValueModified: {
if (transaction.active())
commitValue();
commitValue()
}
function commitValue() {
if (spinBox.backendValue.value !== spinBox.realValue)
spinBox.backendValue.value = spinBox.realValue;
spinBox.backendValue.value = spinBox.realValue
}
property variant backendValue