Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNino van Hooff <ninovanhooff@gmail.com>2019-11-01 15:54:52 +0300
committerNino van Hooff <ninovanhooff@gmail.com>2019-11-04 13:13:48 +0300
commit248f4fc21c791e92a013dbc96a8f7c1adab9f324 (patch)
tree393605e18ed9e8c9d2d4772a2c697a2b79e55341
parent36d4162f35a26a8fa738cca07ea3f12df33d3439 (diff)
Draw the NoIntentIcon over the intent description hover area.
This fixes a bug where the NoIntent tooltip was hidden by the intent description CURA-6936 (cherry picked from commit 315b93a1525ba53f520f12b09669668266f12c6c)
-rw-r--r--resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml29
1 files changed, 16 insertions, 13 deletions
diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml
index 3c7caad470..5e58faec78 100644
--- a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml
+++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml
@@ -124,18 +124,6 @@ Item
elide: Text.ElideRight
}
- NoIntentIcon
- {
- affected_extruders: Cura.MachineManager.extruderPositionsWithNonActiveIntent
- intent_type: model.name
- anchors.right: intentCategoryLabel.right
- anchors.rightMargin: UM.Theme.getSize("narrow_margin").width
- width: intentCategoryLabel.height * 0.75
- anchors.verticalCenter: parent.verticalCenter
- height: width
- visible: Cura.MachineManager.activeIntentCategory == model.intent_category && affected_extruders.length
- }
-
Cura.RadioCheckbar
{
anchors
@@ -164,8 +152,9 @@ Item
isCheckedFunction: checkedFunction
}
- MouseArea // tooltip hover area
+ MouseArea // Intent description tooltip hover area
{
+ id: intentDescriptionHoverArea
anchors.fill: parent
hoverEnabled: true
enabled: model.description !== undefined
@@ -181,6 +170,20 @@ Item
}
onExited: base.hideTooltip()
}
+
+ NoIntentIcon // This icon has hover priority over intentDescriptionHoverArea, so draw it above it.
+ {
+ affected_extruders: Cura.MachineManager.extruderPositionsWithNonActiveIntent
+ intent_type: model.name
+ anchors.right: intentCategoryLabel.right
+ anchors.rightMargin: UM.Theme.getSize("narrow_margin").width
+ width: intentCategoryLabel.height * 0.75
+ anchors.verticalCenter: parent.verticalCenter
+ height: width
+ visible: Cura.MachineManager.activeIntentCategory == model.intent_category && affected_extruders.length
+ }
+
+
}
}