3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 13:34:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Nino van Hooff 2019-10-21 13:37:37 +02:00
commit 2058cf8601
92 changed files with 231 additions and 941 deletions
Download patch file Download diff file Expand all files Collapse all files

21
resources/qml/PrintSetupSelector/Custom/QualitiesWithIntentMenu.qml
View file

@ -70,12 +70,31 @@ Popup
{
id: headerLabel
text: model.name
color: UM.Theme.getColor("text_inactive")
renderType: Text.NativeRendering
width: parent.width
height: visible ? contentHeight: 0
enabled: false
visible: qualitiesList.visibleChildren.length > 0
anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_margin").width
MouseArea // tooltip hover area
{
anchors.fill: parent
hoverEnabled: true
enabled: model.description !== undefined
acceptedButtons: Qt.NoButton // react to hover only, don't steal clicks
onEntered:
{
base.showTooltip(
headerLabel,
Qt.point(- UM.Theme.getSize("default_margin").width, 0),
model.description
)
}
onExited: base.hideTooltip()
}
}
Column

18
resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml
View file

@ -163,6 +163,24 @@ Item
isCheckedFunction: checkedFunction
}
MouseArea // tooltip hover area
{
anchors.fill: parent
hoverEnabled: true
enabled: model.description !== undefined
acceptedButtons: Qt.NoButton // react to hover only, don't steal clicks
onEntered:
{
base.showTooltip(
intentCategoryLabel,
Qt.point(-(intentCategoryLabel.x - qualityRow.x) - UM.Theme.getSize("thick_margin").width, 0),
model.description
)
}
onExited: base.hideTooltip()
}
}
}