3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 14:34:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

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

Browse source 
Menu visual fixes
This commit is contained in:
Evangelos Trantos 2022-02-24 13:22:56 +01:00 • committed by GitHub
commit a2ce010ec1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 25 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/qml/Widgets/Menu.qml
View file

@ -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

6
resources/qml/Widgets/MenuItem.qml
View file

@ -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"
border.color: menuItem.highlighted ? UM.Theme.getColor("setting_control_border_highlight") : "transparent"
color: menuItem.highlighted ? UM.Theme.getColor("secondary"): UM.Theme.getColor("setting_control_highlight")
}
}

6
resources/qml/Widgets/MenuSeparator.qml
View file

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