Adjust color-scheme for button restyle.

Also changed ligh theme.

part of CURA-8012

1 files changed, 6 insertions, 13 deletions

diff --git a/resources/qml/ActionPanel/OutputDevicesActionButton.qml b/resources/qml/ActionPanel/OutputDevicesActionButton.qml
index 0a49c59c77..48416e69fd 100644
--- a/resources/qml/ActionPanel/OutputDevicesActionButton.qml
+++ b/resources/qml/ActionPanel/OutputDevicesActionButton.qml
@@ -42,7 +42,7 @@ Item
         }
     }
 
-    Cura.ActionButton
+    Cura.PrimaryButton
     {
         id: deviceSelectionMenu
         height: parent.height
@@ -56,7 +56,7 @@ Item
         leftPadding: UM.Theme.getSize("narrow_margin").width //Need more space than usual here for wide text.
         rightPadding: UM.Theme.getSize("narrow_margin").width
         iconSource: popup.opened ? UM.Theme.getIcon("ChevronSingleUp") : UM.Theme.getIcon("ChevronSingleDown")
-        color: UM.Theme.getColor("action_panel_secondary")
+        color: popup.opened ? hoverColor : UM.Theme.getColor("action_panel_secondary")
         visible: (devicesModel.deviceCount > 1)
 
         onClicked: popup.opened ? popup.close() : popup.open()
@@ -65,6 +65,7 @@ Item
         {
             id: popup
             padding: 0
+            spacing: 0
 
             y: -height
             x: parent.width - width
@@ -73,17 +74,16 @@ Item
 
             contentItem: ColumnLayout
             {
+                spacing: 0
+
                 Repeater
                 {
                     model: devicesModel
 
-                    delegate: Cura.ActionButton
+                    delegate: Cura.PrimaryButton
                     {
                         text: model.description
                         visible: model.id != UM.OutputDeviceManager.activeDevice  // Don't show the active device in the list
-                        color: "transparent"
-                        cornerRadius: 0
-                        hoverColor: UM.Theme.getColor("primary")
                         Layout.fillWidth: true
                         // The total width of the popup should be defined by the largest button. By stating that each
                         // button should be minimally the size of it's content (aka; implicitWidth) we can ensure that.
@@ -97,13 +97,6 @@ Item
                     }
                 }
             }
-
-            background: Rectangle
-            {
-                opacity: visible ? 1 : 0
-                Behavior on opacity { NumberAnimation { duration: 100 } }
-                color: UM.Theme.getColor("action_panel_secondary")
-            }
         }
     }