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

Add toolbar button icon size

Browse source 
Which is slightly smaller than the button icon

CURA-8202
This commit is contained in:
Konstantinos Karmas 2021-06-30 12:28:08 +02:00
parent 3eafd11587
commit 4583866f57
3 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
resources/qml/PrintSetupSelector/PrintSetupSelectorHeader.qml
View file

@ -15,7 +15,8 @@ RowLayout
Cura.IconWithText Cura.IconWithText
{ {
source: UM.Theme.getIcon("PrintQuality") source: UM.Theme.getIcon("Sliders", "medium")
iconSize: UM.Theme.getSize("button_icon").width
text: text:
{ {
if (Cura.MachineManager.activeStack) if (Cura.MachineManager.activeStack)
@ -53,6 +54,7 @@ RowLayout
source: UM.Theme.getIcon("Infill1") source: UM.Theme.getIcon("Infill1")
text: Cura.MachineManager.activeStack ? parseInt(infillDensity.properties.value) + "%" : "0%" text: Cura.MachineManager.activeStack ? parseInt(infillDensity.properties.value) + "%" : "0%"
font: UM.Theme.getFont("medium") font: UM.Theme.getFont("medium")
iconSize: UM.Theme.getSize("toolbar_button_icon").width
UM.SettingPropertyProvider UM.SettingPropertyProvider
{ {
@ -68,6 +70,7 @@ RowLayout
source: UM.Theme.getIcon("Support") source: UM.Theme.getIcon("Support")
text: supportEnabled.properties.value == "True" ? enabledText : disabledText text: supportEnabled.properties.value == "True" ? enabledText : disabledText
font: UM.Theme.getFont("medium") font: UM.Theme.getFont("medium")
iconSize: UM.Theme.getSize("toolbar_button_icon").width
UM.SettingPropertyProvider UM.SettingPropertyProvider
{ {
@ -83,6 +86,7 @@ RowLayout
source: UM.Theme.getIcon("Adhesion") source: UM.Theme.getIcon("Adhesion")
text: platformAdhesionType.properties.value != "skirt" && platformAdhesionType.properties.value != "none" ? enabledText : disabledText text: platformAdhesionType.properties.value != "skirt" && platformAdhesionType.properties.value != "none" ? enabledText : disabledText
font: UM.Theme.getFont("medium") font: UM.Theme.getFont("medium")
iconSize: UM.Theme.getSize("toolbar_button_icon").width
UM.SettingPropertyProvider UM.SettingPropertyProvider
{ {

10
resources/themes/cura-light/styles.qml
View file

@ -175,8 +175,8 @@ QtObject
{ {
background: Item background: Item
{ {
implicitWidth: UM.Theme.getSize("button").width implicitWidth: UM.Theme.getSize("toolbar_button").width
implicitHeight: UM.Theme.getSize("button").height implicitHeight: UM.Theme.getSize("toolbar_button").height
UM.PointingRectangle UM.PointingRectangle
{ {
@ -252,11 +252,11 @@ QtObject
anchors.centerIn: parent anchors.centerIn: parent
opacity: control.enabled ? 1.0 : 0.2 opacity: control.enabled ? 1.0 : 0.2
source: control.iconSource source: control.iconSource
width: UM.Theme.getSize("button_icon").width width: UM.Theme.getSize("toolbar_button_icon").width
height: UM.Theme.getSize("button_icon").height height: UM.Theme.getSize("toolbar_button_icon").height
color: UM.Theme.getColor("icon") color: UM.Theme.getColor("icon")
sourceSize: UM.Theme.getSize("button_icon") sourceSize: UM.Theme.getSize("toolbar_button_icon")
} }
} }
} }

5
resources/themes/cura-light/theme.json
View file

@ -482,7 +482,7 @@
"machine_selector_widget": [20.0, 4.0], "machine_selector_widget": [20.0, 4.0],
"machine_selector_widget_content": [25.0, 32.0], "machine_selector_widget_content": [25.0, 32.0],
"machine_selector_icon": [2.66, 2.66], "machine_selector_icon": [2.5, 2.5],
"views_selector": [23.0, 4.0], "views_selector": [23.0, 4.0],
@ -527,6 +527,9 @@
"button_icon": [2.5, 2.5], "button_icon": [2.5, 2.5],
"button_lining": [0, 0], "button_lining": [0, 0],
"toolbar_button": [4, 4],
"toolbar_button_icon": [2, 2],
"action_button": [15.0, 2.5], "action_button": [15.0, 2.5],
"action_button_icon": [1.0, 1.0], "action_button_icon": [1.0, 1.0],
"action_button_radius": [0.15, 0.15], "action_button_radius": [0.15, 0.15],