File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -110,7 +110,7 @@ TabRow
110110 property bool valueWarning: ! Cura .SidebarGUIPlugin .getExtruderHasQualityForMaterial (extruderStack)
111111 property bool valueError: Cura .ContainerManager .getContainerMetaDataEntry (extruderStack .material .id , " compatible" , " " ) != " True"
112112
113- visible: valueWarning || valueError
113+ visible: ( tabBar . hasMaterials || tabBar . hasVariants ) && ( valueWarning || valueError)
114114
115115 anchors .right : parent .right
116116 anchors .verticalCenter : parent .verticalCenter
Original file line number Diff line number Diff line change @@ -23,12 +23,21 @@ Cura.RoundedRectangle
2323 }
2424 return UM .Theme .getColor (" action_button" )
2525 }
26+
2627 border .width : UM .Theme .getSize (" default_lining" ).width
2728 border .color : UM .Theme .getColor (" lining" )
2829 radius: UM .Theme .getSize (" default_radius" ).width
2930 cornerSide: Cura .RoundedRectangle .Direction .Left
3031
31- height: printSetupSummary .height + extruderSummary .height + 3 * UM .Theme .getSize (" default_margin" ).height
32+ height:
33+ {
34+ var result = printSetupSummary .height + 2 * UM .Theme .getSize (" default_margin" ).height
35+ if (extruderSummary .visible )
36+ {
37+ result += extruderSummary .height + UM .Theme .getSize (" default_margin" ).height
38+ }
39+ return result
40+ }
3241
3342 Cura .PrintSetupSelectorHeader
3443 {
@@ -63,11 +72,28 @@ Cura.RoundedRectangle
6372 color: UM .Theme .getColor (" small_button_text" )
6473 }
6574
75+ property bool hasMaterials:
76+ {
77+ if (CuraSDKVersion >= " 6.2.0" ) {
78+ return Cura .MachineManager .activeMachine .hasMaterials
79+ } else {
80+ return Cura .MachineManager .hasMaterials
81+ }
82+ }
83+ property bool hasVariants:
84+ {
85+ if (CuraSDKVersion >= " 6.2.0" ) {
86+ return Cura .MachineManager .activeMachine .hasVariants
87+ } else {
88+ return Cura .MachineManager .hasVariants
89+ }
90+ }
91+
6692 ExtruderTabs
6793 {
6894 id: extruderSummary
6995 enabled: false
70- visible: summaryEnabled
96+ visible: summaryEnabled && (hasMaterials || hasVariants)
7197
7298 anchors
7399 {
You can’t perform that action at this time.
0 commit comments