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

Change property connectionStatusMessage into a get function

Browse Source 
This way the tooltip text can be re-evaluated every time we hover over
the instead of only once when the active machine is updated. With this
change, the text will be updated properly when there is a change.

CURA-7438
This commit is contained in:
Kostas Karmas 2020-06-04 14:22:14 +02:00
parent 230ba01d14
commit 65dd0250b3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
resources/qml/PrinterSelector/MachineSelector.qml
View File

@ -35,7 +35,7 @@ Cura.ExpandablePopup
} }
} }
readonly property string connectionStatusMessage: { function getConnectionStatusMessage() {
if (connectionStatus == "printer_cloud_not_available") if (connectionStatus == "printer_cloud_not_available")
{ {
if(Cura.API.connectionStatus.isInternetReachable) if(Cura.API.connectionStatus.isInternetReachable)
@ -139,12 +139,13 @@ Cura.ExpandablePopup
{ {
id: connectionStatusTooltipHoverArea id: connectionStatusTooltipHoverArea
anchors.fill: parent anchors.fill: parent
hoverEnabled: connectionStatusMessage !== "" hoverEnabled: getConnectionStatusMessage() !== ""
acceptedButtons: Qt.NoButton // react to hover only, don't steal clicks acceptedButtons: Qt.NoButton // react to hover only, don't steal clicks
onEntered: onEntered:
{ {
machineSelector.mouseArea.entered() // we want both this and the outer area to be entered machineSelector.mouseArea.entered() // we want both this and the outer area to be entered
tooltip.tooltipText = getConnectionStatusMessage()
tooltip.show() tooltip.show()
} }
onExited: { tooltip.hide() } onExited: { tooltip.hide() }
@ -155,7 +156,7 @@ Cura.ExpandablePopup
id: tooltip id: tooltip
width: 250 * screenScaleFactor width: 250 * screenScaleFactor
tooltipText: connectionStatusMessage tooltipText: getConnectionStatusMessage()
arrowSize: UM.Theme.getSize("button_tooltip_arrow").width arrowSize: UM.Theme.getSize("button_tooltip_arrow").width
x: connectionStatusImage.x - UM.Theme.getSize("narrow_margin").width x: connectionStatusImage.x - UM.Theme.getSize("narrow_margin").width
y: connectionStatusImage.y + connectionStatusImage.height + UM.Theme.getSize("narrow_margin").height y: connectionStatusImage.y + connectionStatusImage.height + UM.Theme.getSize("narrow_margin").height