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

Close the expandable panel when it becomes disabled

Browse Source 
It happens when it's open and the user loads a GCode.

Contributes to CURA-5941
This commit is contained in:
Diego Prado Gesto 2018-12-11 11:10:45 +01:00
parent 4dab33d41b
commit 4b6f4af44e
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
resources/qml/ExpandableComponent.qml
View File

@ -88,7 +88,23 @@ Item
{ {
target: background target: background
property: "color" property: "color"
value: enabled ? (expanded ? headerActiveColor : headerBackgroundColor) : UM.Theme.getColor("disabled") value:
{
return base.enabled ? (expanded ? headerActiveColor : headerBackgroundColor) : UM.Theme.getColor("disabled")
}
}
// The panel needs to close when it becomes disabled
Connections
{
target: base
onEnabledChanged:
{
if (!base.enabled && expanded)
{
toggleContent()
}
}
} }
implicitHeight: 100 * screenScaleFactor implicitHeight: 100 * screenScaleFactor

15
resources/qml/ExpandablePopup.qml
View File

@ -94,7 +94,20 @@ Item
{ {
target: background target: background
property: "color" property: "color"
value: enabled ? headerBackgroundColor : UM.Theme.getColor("disabled") value: base.enabled ? headerBackgroundColor : UM.Theme.getColor("disabled")
}
// The panel needs to close when it becomes disabled
Connections
{
target: base
onEnabledChanged:
{
if (!base.enabled && expanded)
{
toggleContent()
}
}
} }
implicitHeight: 100 * screenScaleFactor implicitHeight: 100 * screenScaleFactor