GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-10 09:19:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Draw the NoIntentIcon over the intent description hover area.

Browse Source 
This fixes a bug where the NoIntent tooltip was hidden by the intent
description

CURA-6936

(cherry picked from commit 315b93a1525ba53f520f12b09669668266f12c6c)
This commit is contained in:
Nino van Hooff 2019-11-01 13:54:52 +01:00
parent 36d4162f35
commit 248f4fc21c
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml
View File

@ -124,18 +124,6 @@ Item
elide: Text.ElideRight 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 Cura.RadioCheckbar
{ {
anchors anchors
@ -164,8 +152,9 @@ Item
isCheckedFunction: checkedFunction isCheckedFunction: checkedFunction
} }
MouseArea // tooltip hover area MouseArea // Intent description tooltip hover area
{ {
id: intentDescriptionHoverArea
anchors.fill: parent anchors.fill: parent
hoverEnabled: true hoverEnabled: true
enabled: model.description !== undefined enabled: model.description !== undefined
@ -181,6 +170,20 @@ Item
} }
onExited: base.hideTooltip() 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
}
} }
} }