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

QmlDesigner Fix for GradientDialog selected item

Browse Source 
Change-Id: Ie7f7a7ad79e3e9bcb796f0fedc3b7d5d9cd8b023
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Aleksei German
2019-08-16 15:30:12 +02:00
parent a1d48830b1
commit c51da3805d
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/HelperWidgets/GradientPresetList.qml
View File

@@ -48,6 +48,7 @@ Dialog {
property int stopsCount;
property int presetID;
property int presetType; //default(0) or custom(1)
property Item selectedItem;
}
function addGradient(stopsPositions, stopsColors, stopsCount) {

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

@@ -64,7 +64,6 @@ Rectangle {
clip: true
delegate: gradientDelegate
property int gridColumns: width / tabBackground.gridCellWidth;
cellWidth: width / gridColumns
cellHeight: 180
@@ -78,6 +77,8 @@ Rectangle {
clip: false
property real flexibleWidth: (gradientTable.width - gradientTable.cellWidth * gradientTable.gridColumns) / gradientTable.gridColumns
property bool isSelected: false
width: gradientTable.cellWidth + flexibleWidth - 8; height: tabBackground.delegateHeight
radius: 16
@@ -93,7 +94,11 @@ Rectangle {
gradientData.presetID = presetID;
gradientData.presetType = presetTabView.currentIndex
// console.log( "#" + preset + " " + presetName + " Stops: " + stopsPosList + " Colors: " + stopsColorList);
if (gradientData.selectedItem != null)
gradientData.selectedItem.isSelected = false
backgroundCard.isSelected = true
gradientData.selectedItem = backgroundCard
}
onEntered: {
if (backgroundCard.state != "CLICKED") {
@@ -107,6 +112,13 @@ Rectangle {
}
} //mouseArea
onIsSelectedChanged: {
if (isSelected)
backgroundCard.state = "CLICKED"
else
backgroundCard.state = "USUAL"
}
states: [
State {
name: "HOVER"
@@ -119,6 +131,17 @@ Rectangle {
border.color: "#029de0"
}
},
State {
name: "CLICKED"
PropertyChanges {
target: backgroundCard
color:"#029de0"
z: 4
clip: true
border.width: 1
border.color: "#606060"
}
},
State {
name: "USUAL"
PropertyChanges