Skip to content

Commit 935d4df

Browse files
committed
Fix legend expanding/contracting when switching from/to Paint Tool
1 parent 78c5c3e commit 935d4df

File tree

1 file changed

+7
-28
lines changed

1 file changed

+7
-28
lines changed

resources/qml/PrepareStageLegend50.qml

Lines changed: 7 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -45,31 +45,12 @@ Cura.ExpandableComponent
4545
{
4646
xrayViewCheckBox.checked = (activeView == "XRayView")
4747
xrayViewCheckBox.visible = ["PaintView", "FastView", "SmartSliceView"].indexOf(activeView) == -1
48-
switch(activeView)
49-
{
50-
case "PaintView":
51-
externalViewLabel.visible = true
52-
externalViewLabel.text = catalog.i18nc("@label", "Paint Tool")
53-
break;
54-
case "FastView":
55-
externalViewLabel.visible = true
56-
externalViewLabel.text = catalog.i18nc("@label", "Fast View")
57-
break;
58-
case "SmartSliceView":
59-
externalViewLabel.visible = true
60-
externalViewLabel.text = catalog.i18nc("@label", "Smart Slice")
61-
break;
62-
default:
63-
externalViewLabel.visible = false
64-
break;
65-
}
6648
}
6749

6850
UM.CheckBox
6951
{
7052
id: xrayViewCheckBox
7153
checked: parent.activeView == "XRayView"
72-
visible: !externalViewLabel.visible
7354
enabled: visible
7455
onClicked:
7556
{
@@ -86,15 +67,6 @@ Cura.ExpandableComponent
8667
width: parent.width
8768
}
8869

89-
UM.Label
90-
{
91-
id: externalViewLabel
92-
93-
height: visible ? UM.Theme.getSize("checkbox").height : 0
94-
width: parent.width
95-
color: UM.Theme.getColor("setting_control_text")
96-
}
97-
9870
Item
9971
{
10072
// mock item to compensate for compatibility mode label in simulation view
@@ -212,5 +184,12 @@ Cura.ExpandableComponent
212184
border.color: UM.Theme.getColor("lining")
213185
}
214186
}
187+
188+
Item
189+
{
190+
// hack to ensure the ExpandableComponent expands/contracts correctly
191+
height: 1
192+
width: parent.width
193+
}
215194
}
216195
}

0 commit comments

Comments
 (0)