Merge branch 'CURA-6851' of github.com:Ultimaker/Cura

This commit is contained in:
Jaime van Kessel 2019-10-21 11:49:12 +02:00
commit d3fb066cac
No known key found for this signature in database
GPG key ID: 3710727397403C91
4 changed files with 70 additions and 13 deletions

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

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()
}
}
}