3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix setting visibility styling working in one theme and not the other.

Browse source 
CURA-8688
This commit is contained in:
j.delarago 2022-03-02 09:06:47 +01:00
parent 5dfc5971e3
commit b2bed4efdd
4 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
plugins/DigitalLibrary/resources/qml/Table.qml
View file

@ -35,7 +35,8 @@ Item
model: columnHeaders model: columnHeaders
Rectangle Rectangle
{ {
width: Math.max(1, Math.round(tableBase.width / headerRepeater.count)) //minimumWidth: Math.max(1, Math.round(tableBase.width / headerRepeater.count))
width: 300
height: UM.Theme.getSize("section").height height: UM.Theme.getSize("section").height
color: UM.Theme.getColor("secondary") color: UM.Theme.getColor("secondary")

8
plugins/PerObjectSettingsTool/PerObjectCategory.qml
View file

@ -12,7 +12,7 @@ Button {
id: base; id: base;
background: Rectangle { background: Rectangle {
color: UM.Theme.getColor("background_3") color: UM.Theme.getColor("category_background")
} }
contentItem: Row contentItem: Row
@ -31,7 +31,7 @@ Button {
height: (label.height / 2) | 0 height: (label.height / 2) | 0
width: height width: height
source: base.checked ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleRight") source: base.checked ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleRight")
color: base.hovered ? UM.Theme.getColor("primary_button_hover"): UM.Theme.getColor("primary_button_text") color: base.hovered ? UM.Theme.getColor("primary_button_hover"): UM.Theme.getColor("text")
} }
} }
UM.RecolorImage UM.RecolorImage
@ -40,14 +40,14 @@ Button {
height: label.height height: label.height
width: height width: height
source: UM.Theme.getIcon(definition.icon) source: UM.Theme.getIcon(definition.icon)
color: base.hovered ? UM.Theme.getColor("primary_button_hover") : UM.Theme.getColor("primary_button_text") color: base.hovered ? UM.Theme.getColor("primary_button_hover") : UM.Theme.getColor("text")
} }
UM.Label UM.Label
{ {
id: label id: label
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
text: base.text text: base.text
color: base.hovered ? UM.Theme.getColor("primary_button_hover") : UM.Theme.getColor("primary_button_text") color: base.hovered ? UM.Theme.getColor("primary_button_hover") : UM.Theme.getColor("text")
font.bold: true font.bold: true
} }
} }

2
resources/themes/cura-dark/theme.json
View file

@ -164,6 +164,8 @@
"checkbox_text": "text_default", "checkbox_text": "text_default",
"checkbox_disabled": "background_2", "checkbox_disabled": "background_2",
"category_background": "background_3",
"tooltip": "background_2", "tooltip": "background_2",
"tooltip_text": "text_default", "tooltip_text": "text_default",

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

@ -332,6 +332,8 @@
"checkbox_disabled": "background_2", "checkbox_disabled": "background_2",
"checkbox_text": [0, 12, 26, 255], "checkbox_text": [0, 12, 26, 255],
"category_background": "background_2",
"tooltip": [25, 25, 25, 255], "tooltip": [25, 25, 25, 255],
"tooltip_text": [255, 255, 255, 255], "tooltip_text": [255, 255, 255, 255],