Просмотр исходного кода

Update the look & feel of openButton to the new design

CURA-5785
Jaime van Kessel 6 лет назад
Родитель
Сommit
12c2962414
1 измененных файлов с 21 добавлено и 9 удалено
  1. 21 9
      plugins/PrepareStage/PrepareMenu.qml

+ 21 - 9
plugins/PrepareStage/PrepareMenu.qml

@@ -23,19 +23,30 @@ Item
     Item
     {
         anchors.horizontalCenter: parent.horizontalCenter
-        width: openFileButton.width + itemRowBackground.width
+        width: openFileButtonBackground.width + itemRowBackground.width
         height: parent.height
 
-        Button
+        Rectangle
         {
-            id: openFileButton
-            text: catalog.i18nc("@action:button", "Open File")
-            iconSource: UM.Theme.getIcon("load")
-            style: UM.Theme.styles.tool_button
-            tooltip: ""
-            action: Cura.Actions.open
+            id: openFileButtonBackground
+            height: UM.Theme.getSize("stage_menu").height
+            width: UM.Theme.getSize("stage_menu").height
+
+            radius: UM.Theme.getSize("default_radius").width
+            color: UM.Theme.getColor("toolbar_background")
+            Button
+            {
+                id: openFileButton
+                text: catalog.i18nc("@action:button", "Open File")
+                iconSource: UM.Theme.getIcon("load")
+                style: UM.Theme.styles.toolbar_button
+                tooltip: ""
+                action: Cura.Actions.open
+                anchors.centerIn: parent
+            }
         }
 
+
         Rectangle
         {
             id: itemRowBackground
@@ -46,7 +57,7 @@ Item
             width: itemRow.width + UM.Theme.getSize("default_margin").width
             height: parent.height
 
-            anchors.left: openFileButton.right
+            anchors.left: openFileButtonBackground.right
             anchors.leftMargin: UM.Theme.getSize("default_margin").width
 
             RowLayout
@@ -57,6 +68,7 @@ Item
 
                 width: 0.9 * prepareMenu.width
                 height: parent.height
+                spacing: 0
 
                 Cura.MachineSelector
                 {