Browse Source

Remove DropShadow from ExpandablePopup and ExpandableComponent

Since they are not used anywhere anymore

CURA-8202
Konstantinos Karmas 3 years ago
parent
commit
0505842235

+ 0 - 1
plugins/MonitorStage/MonitorMenu.qml

@@ -17,7 +17,6 @@ Item
         id: machineSelection
         headerBackgroundBorder.width: UM.Theme.getSize("default_lining").width
         headerBackgroundBorder.color: UM.Theme.getColor("lining")
-        enableHeaderShadow: false
         headerCornerSide: Cura.RoundedRectangle.Direction.All
         width: UM.Theme.getSize("machine_selector_widget").width
         height: parent.height

+ 0 - 2
plugins/PrepareStage/PrepareMenu.qml

@@ -54,7 +54,6 @@ Item
                 headerCornerSide: Cura.RoundedRectangle.Direction.Left
                 headerBackgroundBorder.width: UM.Theme.getSize("default_lining").width
                 headerBackgroundBorder.color: UM.Theme.getColor("lining")
-                enableHeaderShadow: false
                 Layout.preferredWidth: parent.machineSelectorWidth
                 Layout.fillWidth: true
                 Layout.fillHeight: true
@@ -63,7 +62,6 @@ Item
             Cura.ConfigurationMenu
             {
                 id: printerSetup
-                enableHeaderShadow: false
                 headerBackgroundBorder.width: UM.Theme.getSize("default_lining").width
                 headerBackgroundBorder.color: UM.Theme.getColor("lining")
                 Layout.fillHeight: true

+ 0 - 1
plugins/PreviewStage/PreviewMenu.qml

@@ -46,7 +46,6 @@ Item
             width: UM.Theme.getSize("views_selector").width
             headerBackgroundBorder.width: UM.Theme.getSize("default_lining").width
             headerBackgroundBorder.color: UM.Theme.getColor("lining")
-            enableHeaderShadow: false
             headerCornerSide: Cura.RoundedRectangle.Direction.Left
         }
 

+ 0 - 1
plugins/SimulationView/SimulationViewMenuComponent.qml

@@ -18,7 +18,6 @@ Cura.ExpandableComponent
     dragPreferencesNamePrefix: "view/colorscheme"
     headerBackgroundBorder.width: UM.Theme.getSize("default_lining").width
     headerBackgroundBorder.color: UM.Theme.getColor("lining")
-    enableHeaderShadow: false
 
     contentHeaderTitle: catalog.i18nc("@label", "Color scheme")
 

+ 2 - 22
resources/qml/ExpandableComponent.qml

@@ -7,8 +7,6 @@ import QtQuick.Controls 2.3
 import UM 1.2 as UM
 import Cura 1.0 as Cura
 
-import QtGraphicalEffects 1.0 // For the dropshadow
-
 // The expandable component has 2 major sub components:
 //      * The headerItem; Always visible and should hold some info about what happens if the component is expanded
 //      * The contentItem; The content that needs to be shown if the component is expanded.
@@ -75,11 +73,7 @@ Item
     // On what side should the header corners be shown? 1 is down, 2 is left, 3 is up and 4 is right.
     property alias headerCornerSide: background.cornerSide
 
-    property alias headerShadowColor: shadow.color
-
-    property alias enableHeaderShadow: shadow.visible
-
-    property int shadowOffset: 2
+    property int popupOffset: 2
 
     // Prefix used for the dragged position preferences. Preferences not used if empty. Don't translate!
     property string dragPreferencesNamePrefix: ""
@@ -186,20 +180,6 @@ Item
         }
     }
 
-    DropShadow
-    {
-        id: shadow
-        // Don't blur the shadow
-        radius: 0
-        anchors.fill: background
-        source: background
-        verticalOffset: base.shadowOffset
-        visible: true
-        color: UM.Theme.getColor("action_button_shadow")
-        // Should always be drawn behind the background.
-        z: background.z - 1
-    }
-
     Cura.RoundedRectangle
     {
         id: contentContainer
@@ -211,7 +191,7 @@ Item
         height: childrenRect.height
 
         // Ensure that the content is located directly below the headerItem
-        y: dragPreferencesNamePrefix === "" ? (background.height + base.shadowOffset + base.contentSpacingY) : UM.Preferences.getValue(dragPreferencesNamePrefix + dragPreferencesNameY)
+        y: dragPreferencesNamePrefix === "" ? (background.height + base.popupOffset + base.contentSpacingY) : UM.Preferences.getValue(dragPreferencesNamePrefix + dragPreferencesNameY)
 
         // Make the content aligned with the rest, using the property contentAlignment to decide whether is right or left.
         // In case of right alignment, the 3x padding is due to left, right and padding between the button & text.

+ 2 - 22
resources/qml/ExpandablePopup.qml

@@ -7,8 +7,6 @@ import QtQuick.Controls 2.3
 import UM 1.2 as UM
 import Cura 1.0 as Cura
 
-import QtGraphicalEffects 1.0 // For the dropshadow
-
 // The expandable component has 2 major sub components:
 //      * The headerItem; Always visible and should hold some info about what happens if the component is expanded
 //      * The contentItem; The content that needs to be shown if the component is expanded.
@@ -74,11 +72,7 @@ Item
     // Change the contentItem close behaviour
     property alias contentClosePolicy : content.closePolicy
 
-    property alias headerShadowColor: shadow.color
-
-    property alias enableHeaderShadow: shadow.visible
-
-    property int shadowOffset: 2
+    property int popupOffset: 2
 
     onEnabledChanged:
     {
@@ -190,26 +184,12 @@ Item
 
     }
 
-    DropShadow
-    {
-        id: shadow
-        // Don't blur the shadow
-        radius: 0
-        anchors.fill: background
-        source: background
-        verticalOffset: base.shadowOffset
-        visible: true
-        color: UM.Theme.getColor("action_button_shadow")
-        // Should always be drawn behind the background.
-        z: background.z - 1
-    }
-
     Popup
     {
         id: content
 
         // Ensure that the content is located directly below the headerItem
-        y: background.height + base.shadowOffset
+        y: background.height + base.popupOffset
 
         // Make the content aligned with the rest, using the property contentAlignment to decide whether is right or left.
         // In case of right alignment, the 3x padding is due to left, right and padding between the button & text.

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

@@ -17,7 +17,6 @@ Cura.ExpandableComponent
 
     contentPadding: UM.Theme.getSize("default_lining").width
     contentHeaderTitle: catalog.i18nc("@label", "Print settings")
-    enableHeaderShadow: false
     headerBackgroundBorder.width: UM.Theme.getSize("default_lining").width
     headerBackgroundBorder.color: UM.Theme.getColor("lining")
     enabled: !preSlicedData