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

Merge branch 'fix_toolbutton_style' of github.com:Ultimaker/Cura into 4.0

Browse Source
This commit is contained in:
Jaime van Kessel 2018-12-13 13:26:35 +01:00
commit b7ea075fa9
2 changed files with 20 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
resources/themes/cura-light/styles.qml
View File

@ -177,8 +177,8 @@ QtObject
{ {
background: Item background: Item
{ {
implicitWidth: Theme.getSize("button").width; implicitWidth: Theme.getSize("button").width
implicitHeight: Theme.getSize("button").height; implicitHeight: Theme.getSize("button").height
UM.PointingRectangle UM.PointingRectangle
{ {
@ -205,20 +205,20 @@ QtObject
id: button_tip id: button_tip
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter; anchors.verticalCenter: parent.verticalCenter
text: control.text; text: control.text;
font: Theme.getFont("button_tooltip"); font: Theme.getFont("button_tooltip")
color: Theme.getColor("tooltip_text"); color: Theme.getColor("tooltip_text")
} }
} }
Rectangle Rectangle
{ {
id: buttonFace; id: buttonFace
anchors.fill: parent; anchors.fill: parent
property bool down: control.pressed || (control.checkable && control.checked); property bool down: control.pressed || (control.checkable && control.checked)
color: color:
{ {
@ -228,58 +228,22 @@ QtObject
} }
else if(control.checkable && control.checked && control.hovered) else if(control.checkable && control.checked && control.hovered)
{ {
return Theme.getColor("button_active_hover"); return Theme.getColor("toolbar_button_active_hover")
} }
else if(control.pressed || (control.checkable && control.checked)) else if(control.pressed || (control.checkable && control.checked))
{ {
return Theme.getColor("button_active"); return Theme.getColor("toolbar_button_active")
} }
else if(control.hovered) else if(control.hovered)
{ {
return Theme.getColor("button_hover"); return Theme.getColor("toolbar_button_hover")
}
else
{
return Theme.getColor("button");
} }
return Theme.getColor("toolbar_background")
} }
Behavior on color { ColorAnimation { duration: 50; } } Behavior on color { ColorAnimation { duration: 50; } }
border.width: (control.hasOwnProperty("needBorder") && control.needBorder) ? 2 * screenScaleFactor : 0 border.width: (control.hasOwnProperty("needBorder") && control.needBorder) ? Theme.getSize("default_lining").width : 0
border.color: Theme.getColor("tool_button_border") border.color: Theme.getColor("lining")
UM.RecolorImage
{
id: tool_button_arrow
anchors.right: parent.right;
anchors.rightMargin: Theme.getSize("button").width - Math.round(Theme.getSize("button_icon").width / 4)
anchors.bottom: parent.bottom;
anchors.bottomMargin: Theme.getSize("button").height - Math.round(Theme.getSize("button_icon").height / 4)
width: Theme.getSize("standard_arrow").width
height: Theme.getSize("standard_arrow").height
sourceSize.height: width
visible: control.menu != null;
color:
{
if(control.checkable && control.checked && control.hovered)
{
return Theme.getColor("button_text_active_hover");
}
else if(control.pressed || (control.checkable && control.checked))
{
return Theme.getColor("button_text_active");
}
else if(control.hovered)
{
return Theme.getColor("button_text_hover");
}
else
{
return Theme.getColor("button_text");
}
}
source: Theme.getIcon("arrow_bottom")
}
} }
} }
@ -287,30 +251,12 @@ QtObject
{ {
UM.RecolorImage UM.RecolorImage
{ {
anchors.centerIn: parent; anchors.centerIn: parent
opacity: !control.enabled ? 0.2 : 1.0 opacity: control.enabled ? 1.0 : 0.2
source: control.iconSource; source: control.iconSource
width: Theme.getSize("button_icon").width; width: Theme.getSize("button_icon").width
height: Theme.getSize("button_icon").height; height: Theme.getSize("button_icon").height
color: color: Theme.getColor("toolbar_button_text")
{
if(control.checkable && control.checked && control.hovered)
{
return Theme.getColor("button_text_active_hover");
}
else if(control.pressed || (control.checkable && control.checked))
{
return Theme.getColor("button_text_active");
}
else if(control.hovered)
{
return Theme.getColor("button_text_hover");
}
else
{
return Theme.getColor("button_text");
}
}
sourceSize: Theme.getSize("button_icon") sourceSize: Theme.getSize("button_icon")
} }

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

@ -243,8 +243,6 @@
"tooltip": [68, 192, 255, 255], "tooltip": [68, 192, 255, 255],
"tooltip_text": [255, 255, 255, 255], "tooltip_text": [255, 255, 255, 255],
"tool_button_border": [255, 255, 255, 0],
"message_background": [255, 255, 255, 255], "message_background": [255, 255, 255, 255],
"message_shadow": [0, 0, 0, 120], "message_shadow": [0, 0, 0, 120],
"message_border": [192, 193, 194, 255], "message_border": [192, 193, 194, 255],