3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-09 14:55:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into STAR-322_cloud-connection

Browse source
This commit is contained in:
ChrisTerBeke 2018-12-11 12:35:19 +01:00
commit 1cfc6d850a
4 changed files with 57 additions and 8 deletions
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
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

15
resources/qml/ExpandablePopup.qml
View file

@ -94,7 +94,20 @@ Item
{
target: background
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