Merge pull request #11521 from Ultimaker/CURA-8928_menu_visual_fixes

Menu visual fixes

resources/qml/Menus/ContextMenu.qml

@@ -8,7 +8,7 @@ import QtQuick.Window 2.1
 import UM 1.5 as UM
 import Cura 1.0 as Cura
 
-Menu
+Cura.Menu
 {
     id: base
 

resources/qml/Menus/EditMenu.qml

@@ -7,13 +7,13 @@ import QtQuick.Controls 2.1
 import UM 1.6 as UM
 import Cura 1.0 as Cura
 
-Menu
+Cura.Menu
 {
     title: catalog.i18nc("@title:menu menubar:toplevel", "&Edit")
 
     Cura.MenuItem { action: Cura.Actions.undo }
     Cura.MenuItem { action: Cura.Actions.redo }
-    MenuSeparator { }
+    Cura.MenuSeparator { }
     Cura.MenuItem { action: Cura.Actions.selectAll }
     Cura.MenuItem { action: Cura.Actions.arrangeAll }
     Cura.MenuItem { action: Cura.Actions.multiplySelection }
@@ -21,7 +21,7 @@ Menu
     Cura.MenuItem { action: Cura.Actions.deleteAll }
     Cura.MenuItem { action: Cura.Actions.resetAllTranslation }
     Cura.MenuItem { action: Cura.Actions.resetAll }
-    MenuSeparator { }
+    Cura.MenuSeparator { }
     Cura.MenuItem { action: Cura.Actions.groupObjects }
     Cura.MenuItem { action: Cura.Actions.mergeObjects }
     Cura.MenuItem { action: Cura.Actions.unGroupObjects }

resources/qml/Menus/FileMenu.qml

@@ -69,7 +69,7 @@ Cura.Menu
         enabled: UM.WorkspaceFileHandler.enabled
     }
 
-    MenuSeparator { }
+    Cura.MenuSeparator { }
 
     Cura.MenuItem
     {
@@ -91,7 +91,7 @@ Cura.Menu
         onTriggered: UM.OutputDeviceManager.requestWriteSelectionToDevice("local_file", PrintInformation.jobName, { "filter_by_machine": false, "preferred_mimetypes": "application/vnd.ms-package.3dmanufacturing-3dmodel+xml"})
     }
 
-    MenuSeparator { }
+    Cura.MenuSeparator { }
 
     Cura.MenuItem
     {
@@ -99,7 +99,7 @@ Cura.Menu
         action: Cura.Actions.reloadAll
     }
 
-    MenuSeparator { }
+    Cura.MenuSeparator { }
 
     Cura.MenuItem { action: Cura.Actions.quit }
 }

resources/qml/Menus/HelpMenu.qml

@@ -8,7 +8,7 @@ import UM 1.5 as UM
 import Cura 1.0 as Cura
 
 
-Menu
+Cura.Menu
 {
     id: helpMenu
     title: catalog.i18nc("@title:menu menubar:toplevel", "&Help")

resources/qml/Menus/MaterialMenu.qml

@@ -72,7 +72,7 @@ Cura.Menu
 
     Cura.MenuSeparator { visible: favoriteMaterialsModel.items.length > 0}
 
-    Menu
+    Cura.Menu
     {
         id: genericMenu
         title: catalog.i18nc("@label:category menu label", "Generic")

resources/qml/Menus/PreferencesMenu.qml

@@ -7,7 +7,7 @@ import QtQuick.Controls 2.4
 import UM 1.5 as UM
 import Cura 1.0 as Cura
 
-Menu
+Cura.Menu
 {
     id: preferencesMenu
 

resources/qml/Menus/SettingsMenu.qml

@@ -39,7 +39,7 @@ Cura.Menu
                 onAboutToHide: updateModels = false
             }
 
-            MenuSeparator
+            Cura.MenuSeparator
             {
                 visible: Cura.MachineManager.activeMachine.hasVariants || Cura.MachineManager.activeMachine.hasMaterials
             }

resources/qml/Widgets/Menu.qml

@@ -12,9 +12,11 @@ import Cura 1.0 as Cura
 UM.Menu
 {
     id: menu
+    topPadding: UM.Theme.getSize("narrow_margin").height
+    bottomPadding: UM.Theme.getSize("narrow_margin").height
     padding: 0
 
-    implicitWidth: UM.Theme.getSize("setting_control").width
+    implicitWidth: UM.Theme.getSize("menu").width
 
     delegate: Cura.MenuItem {}
     background: Rectangle

resources/qml/Widgets/MenuItem.qml

@@ -13,7 +13,8 @@ UM.MenuItem
 {
     id: menuItem
 
-    implicitHeight: UM.Theme.getSize("setting_control").height + UM.Theme.getSize("narrow_margin").height
+    implicitHeight: UM.Theme.getSize("menu").height + UM.Theme.getSize("narrow_margin").height
+    implicitWidth: UM.Theme.getSize("menu").width
     opacity: enabled ? 1.0 : 0.5
 
     arrow: UM.RecolorImage
@@ -48,7 +49,6 @@ UM.MenuItem
         width: menuItem.width - 2 * UM.Theme.getSize("default_lining").width
         height: menuItem.height - 2 * UM.Theme.getSize("default_lining").height
 
-        color: menuItem.highlighted ?  UM.Theme.getColor("setting_control_highlight") : "transparent"
+        color: menuItem.highlighted ? UM.Theme.getColor("secondary"): UM.Theme.getColor("setting_control_highlight")
-        border.color: menuItem.highlighted ? UM.Theme.getColor("setting_control_border_highlight") : "transparent"
     }
 }

resources/qml/Widgets/MenuSeparator.qml

@@ -11,8 +11,10 @@ import UM 1.1 as UM
 //
 MenuSeparator
 {
-    padding: 0
+    leftPadding: UM.Theme.getSize("default_margin").width
-    contentItem: Rectangle {
+    rightPadding: UM.Theme.getSize("default_margin").width
+    contentItem: Rectangle
+    {
         implicitHeight: UM.Theme.getSize("default_lining").height
         color: UM.Theme.getColor("setting_control_border")
     }

resources/themes/cura-light/theme.json

@@ -184,10 +184,12 @@
         "primary_hover": [48, 182, 231, 255],
         "primary_text": [255, 255, 255, 255],
         "border": [127, 127, 127, 255],
-        "text_selection": [156,195, 255, 127],
+        "text_selection": [156, 195, 255, 127],
         "secondary": [240, 240, 240, 255],
         "secondary_shadow": [216, 216, 216, 255],
 
+        "text_lighter": [108, 108, 108, 255],
+
         "icon": [8, 7, 63, 255],
 
         "primary_button": [25, 110, 240, 255],
@@ -639,6 +641,7 @@
         "message_action_button": [0, 2.5],
         "message_image": [15.0, 10.0],
         "message_type_icon": [2, 2],
+        "menu": [18, 2],
 
         "infill_button_margin": [0.5, 0.5],