GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 20:19:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix sizing of materialBrandSelection

Browse Source 
This also cleans up some stuff from the theme. Huzzah

CURA-8979
This commit is contained in:
Jaime van Kessel 2022-03-15 10:25:56 +01:00
parent 93405bdb93
commit f760ca146d
4 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
resources/qml/Preferences/Materials/MaterialsBrandSection.qml
View File

@ -23,9 +23,8 @@ Column
Cura.CategoryButton Cura.CategoryButton
{ {
width: parent.width width: parent.width
height: UM.Theme.getSize("favorites_row").height
labelText: sectionName labelText: sectionName
labelFont: UM.Theme.getFont("default_bold") labelFont: UM.Theme.getFont("medium_bold")
expanded: brand_section.expanded expanded: brand_section.expanded
onClicked: onClicked:
{ {

2
resources/qml/Preferences/Materials/MaterialsSlot.qml
View File

@ -17,7 +17,7 @@ Rectangle
property var material: null property var material: null
property bool hovered: false property bool hovered: false
height: UM.Theme.getSize("favorites_row").height height: UM.Theme.getSize("preferences_page_list_item").height
width: parent.width width: parent.width
color: UM.Theme.getColor("main_background") color: UM.Theme.getColor("main_background")

2
resources/qml/Preferences/Materials/MaterialsTypeSection.qml
View File

@ -23,7 +23,7 @@ Column
{ {
id: categoryButton id: categoryButton
width: parent.width width: parent.width
height: UM.Theme.getSize("favorites_row").height height: UM.Theme.getSize("preferences_page_list_item").height
labelText: materialName labelText: materialName
labelFont: UM.Theme.getFont("default") labelFont: UM.Theme.getFont("default")
expanded: material_type_section.expanded expanded: material_type_section.expanded

6
resources/themes/cura-light/theme.json
View File

@ -431,8 +431,6 @@
"layerview_nozzle": [224, 192, 16, 64], "layerview_nozzle": [224, 192, 16, 64],
"layerview_starts": [255, 255, 255, 255], "layerview_starts": [255, 255, 255, 255],
"favorites_header_bar": [245, 245, 245, 255],
"favorites_row_selected": [196, 239, 255, 255],
"monitor_printer_family_tag": [228, 228, 242, 255], "monitor_printer_family_tag": [228, 228, 242, 255],
"monitor_text_disabled": [238, 238, 238, 255], "monitor_text_disabled": [238, 238, 238, 255],
@ -562,10 +560,6 @@
"context_menu": [20, 2], "context_menu": [20, 2],
"favorites_row": [2, 2],
"favorites_button": [2, 2],
"favorites_button_icon": [1.2, 1.2],
"icon_indicator": [1, 1], "icon_indicator": [1, 1],
"printer_status_icon": [1.0, 1.0], "printer_status_icon": [1.0, 1.0],