Update theme styles with the new Angled Corner rectangle

This commit is contained in:
Arjen Hiemstra 2015-03-30 10:57:00 +02:00
parent cd76d37585
commit 0ddf01aff5

View file

@ -20,7 +20,7 @@ QtObject {
property bool down: control.pressed || (control.checkable && control.checked); property bool down: control.pressed || (control.checkable && control.checked);
font: UM.Theme.fonts.sidebar_header; font: UM.Theme.fonts.sidebar_header;
color: control.hovered ? UM.Theme.colors.text_hover : down ? UM.Theme.colors.text_pressed : UM.Theme.colors.text; color: down ? UM.Theme.colors.text_pressed : control.hovered ? UM.Theme.colors.text_hover : UM.Theme.colors.text;
text: control.text; text: control.text;
} }
@ -29,10 +29,13 @@ QtObject {
property Component tool_button: Component { property Component tool_button: Component {
ButtonStyle { ButtonStyle {
background: Rectangle { background: UM.AngledCornerRectangle {
property bool down: control.pressed || (control.checkable && control.checked);
implicitWidth: UM.Theme.sizes.button.width; implicitWidth: UM.Theme.sizes.button.width;
implicitHeight: UM.Theme.sizes.button.height; implicitHeight: UM.Theme.sizes.button.height;
color: UM.Theme.colors.primary; color: down ? UM.Theme.colors.button_down : control.hovered ? UM.Theme.colors.button_hover : UM.Theme.colors.button;
cornerSize: UM.Theme.sizes.default_margin.width;
} }
label: Item { label: Item {