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

QmlDesigner: Update the value of the color picker for CollectionEditor

Browse Source 
Fixes: QDS-11796
Change-Id: Iaf3f6bc06771f461c4119d55ae3c3a294d3d8564
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
This commit is contained in:
Ali Kianian
2024-02-12 18:45:05 +02:00
parent e66b19d4c4
commit 4c4e90062c
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
share/qtcreator/qmldesigner/collectionEditorQmlSource/ColorViewDelegate.qml
View File

@@ -42,6 +42,19 @@ Row {
property bool __block: false
function getColorFromEditValue() {
if (!edit)
return "white" // default color for Rectangle
if (colorEditor.isVector3D) {
return Qt.rgba(__editColor.x,
__editColor.y,
__editColor.z, 1)
}
return __editColor
}
function resetShapeColor() {
if (edit)
edit = ""
@@ -64,7 +77,7 @@ Row {
// Syncing color from backend to frontend and block reflection
function syncColor() {
colorEditor.__block = true
colorEditor.color = colorEditor.value
colorEditor.color = colorEditor.getColorFromEditValue()
hexTextField.syncColor()
colorEditor.__block = false
}
@@ -201,10 +214,10 @@ Row {
}
function isSolid() {
if (!loader.active)
return true
if (!loader.active)
return true
return popupDialog.loaderItem.isSolid()
return popupDialog.loaderItem.isSolid()
}
function isLinearGradient(){
@@ -221,6 +234,7 @@ Row {
function open() {
popupDialog.ensureLoader()
popupDialog.loaderItem.initEditor()
popupDialog.show(preview)
}