Browse Source

Set header border and color by default in ExpandablePopup and Component

CURA-8202
Konstantinos Karmas 3 years ago
parent
commit
a7446d681f

+ 0 - 2
plugins/MonitorStage/MonitorMenu.qml

@@ -15,8 +15,6 @@ Item
     Cura.MachineSelector
     {
         id: machineSelection
-        headerBackgroundBorder.width: UM.Theme.getSize("default_lining").width
-        headerBackgroundBorder.color: UM.Theme.getColor("lining")
         headerCornerSide: Cura.RoundedRectangle.Direction.All
         width: UM.Theme.getSize("machine_selector_widget").width
         height: parent.height

+ 0 - 4
plugins/PrepareStage/PrepareMenu.qml

@@ -52,8 +52,6 @@ Item
             {
                 id: machineSelection
                 headerCornerSide: Cura.RoundedRectangle.Direction.Left
-                headerBackgroundBorder.width: UM.Theme.getSize("default_lining").width
-                headerBackgroundBorder.color: UM.Theme.getColor("lining")
                 Layout.preferredWidth: parent.machineSelectorWidth
                 Layout.fillWidth: true
                 Layout.fillHeight: true
@@ -62,8 +60,6 @@ Item
             Cura.ConfigurationMenu
             {
                 id: printerSetup
-                headerBackgroundBorder.width: UM.Theme.getSize("default_lining").width
-                headerBackgroundBorder.color: UM.Theme.getColor("lining")
                 Layout.fillHeight: true
                 Layout.fillWidth: true
                 Layout.preferredWidth: parent.machineSelectorWidth * 2

+ 0 - 2
plugins/PreviewStage/PreviewMenu.qml

@@ -44,8 +44,6 @@ Item
             id: viewsSelector
             height: parent.height
             width: UM.Theme.getSize("views_selector").width
-            headerBackgroundBorder.width: UM.Theme.getSize("default_lining").width
-            headerBackgroundBorder.color: UM.Theme.getColor("lining")
             headerCornerSide: Cura.RoundedRectangle.Direction.Left
         }
 

+ 0 - 2
plugins/SimulationView/SimulationViewMenuComponent.qml

@@ -16,8 +16,6 @@ Cura.ExpandableComponent
     id: base
 
     dragPreferencesNamePrefix: "view/colorscheme"
-    headerBackgroundBorder.width: UM.Theme.getSize("default_lining").width
-    headerBackgroundBorder.color: UM.Theme.getColor("lining")
 
     contentHeaderTitle: catalog.i18nc("@label", "Color scheme")
 

+ 6 - 0
resources/qml/ExpandableComponent.qml

@@ -56,6 +56,9 @@ Item
 
     property alias headerBackgroundBorder: background.border
 
+    // Whether or not to show the background border
+    property bool enableHeaderBackgroundBorder: true
+
     // What icon should be displayed on the right.
     property alias iconSource: collapseButton.source
 
@@ -116,6 +119,9 @@ Item
         id: background
         property real padding: UM.Theme.getSize("default_margin").width
 
+        border.width: base.enableHeaderBackgroundBorder ? UM.Theme.getSize("default_lining").width : 0
+        border.color: UM.Theme.getColor("lining")
+
         color: base.enabled ? (base.expanded ? headerActiveColor : headerBackgroundColor) : UM.Theme.getColor("disabled")
         anchors.fill: parent
 

+ 6 - 0
resources/qml/ExpandablePopup.qml

@@ -50,6 +50,9 @@ Item
 
     property alias headerBackgroundBorder: background.border
 
+    // Whether or not to show the background border
+    property bool enableHeaderBackgroundBorder: true
+
     // What icon should be displayed on the right.
     property alias iconSource: collapseButton.source
 
@@ -110,6 +113,9 @@ Item
         id: background
         property real padding: UM.Theme.getSize("default_margin").width
 
+        border.width: base.enableHeaderBackgroundBorder ? UM.Theme.getSize("default_lining").width : 0
+        border.color: UM.Theme.getColor("lining")
+
         color: base.enabled ? headerBackgroundColor : UM.Theme.getColor("disabled")
         anchors.fill: parent
 

+ 0 - 2
resources/qml/PrintSetupSelector/PrintSetupSelector.qml

@@ -17,8 +17,6 @@ Cura.ExpandableComponent
 
     contentPadding: UM.Theme.getSize("default_lining").width
     contentHeaderTitle: catalog.i18nc("@label", "Print settings")
-    headerBackgroundBorder.width: UM.Theme.getSize("default_lining").width
-    headerBackgroundBorder.color: UM.Theme.getColor("lining")
     enabled: !preSlicedData
     disabledText: catalog.i18nc("@label shown when we load a Gcode file", "Print setup disabled. G-code file can not be modified.")