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

Make all the top right buttons uniform

Browse Source 
Instead of inverting the fill and the text color in those buttons when hovering on those buttons, they will now show a light background fill when hovered.

CURA-8421
This commit is contained in:
Konstantinos Karmas 2021-09-21 15:36:31 +02:00
parent ab77efd9c4
commit c91509418e
2 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
resources/qml/Account/AccountWidget.qml
View File

@ -32,9 +32,17 @@ Item
background: Rectangle background: Rectangle
{ {
radius: UM.Theme.getSize("action_button_radius").width radius: UM.Theme.getSize("action_button_radius").width
color: signInButton.hovered ? UM.Theme.getColor("primary_text") : UM.Theme.getColor("main_window_header_background") color: UM.Theme.getColor("main_window_header_background")
border.width: UM.Theme.getSize("default_lining").width border.width: UM.Theme.getSize("default_lining").width
border.color: UM.Theme.getColor("primary_text") border.color: UM.Theme.getColor("primary_text")
Rectangle
{
anchors.fill: parent
radius: parent.radius
color: UM.Theme.getColor("primary_text")
opacity: signInButton.hovered ? 0.2 : 0
}
} }
contentItem: Label contentItem: Label
@ -42,7 +50,7 @@ Item
id: label id: label
text: signInButton.text text: signInButton.text
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
color: signInButton.hovered ? UM.Theme.getColor("main_window_header_background") : UM.Theme.getColor("primary_text") color: UM.Theme.getColor("primary_text")
width: contentWidth width: contentWidth
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering renderType: Text.NativeRendering
@ -89,9 +97,18 @@ Item
width: Math.min(accountWidget.width, accountWidget.height) width: Math.min(accountWidget.width, accountWidget.height)
height: width height: width
radius: width radius: width
color: accountWidget.hovered ? UM.Theme.getColor("primary_text") : "transparent" color: UM.Theme.getColor("main_window_header_background")
border.width: 1 border.width: UM.Theme.getSize("default_lining").width
border.color: UM.Theme.getColor("primary_text") border.color: UM.Theme.getColor("primary_text")
Rectangle
{
id: initialCircleFill
anchors.fill: parent
radius: parent.radius
color: UM.Theme.getColor("primary_text")
opacity: accountWidget.hovered ? 0.2 : 0
}
} }
Label Label
@ -101,7 +118,7 @@ Item
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
text: accountWidget.text text: accountWidget.text
font: UM.Theme.getFont("large_bold") font: UM.Theme.getFont("large_bold")
color: accountWidget.hovered ? UM.Theme.getColor("main_window_header_background") : UM.Theme.getColor("primary_text") color: UM.Theme.getColor("primary_text")
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
renderType: Text.NativeRendering renderType: Text.NativeRendering

14
resources/qml/MainWindow/MainWindowHeader.qml
View File

@ -95,10 +95,20 @@ Item
background: Rectangle background: Rectangle
{ {
id: marketplaceButtonBorder
radius: UM.Theme.getSize("action_button_radius").width radius: UM.Theme.getSize("action_button_radius").width
color: marketplaceButton.hovered ? UM.Theme.getColor("primary_text") : UM.Theme.getColor("main_window_header_background") color: UM.Theme.getColor("main_window_header_background")
border.width: UM.Theme.getSize("default_lining").width border.width: UM.Theme.getSize("default_lining").width
border.color: UM.Theme.getColor("primary_text") border.color: UM.Theme.getColor("primary_text")
Rectangle
{
id: marketplaceButtonFill
anchors.fill: parent
radius: parent.radius
color: UM.Theme.getColor("primary_text")
opacity: marketplaceButton.hovered ? 0.2 : 0
}
} }
contentItem: Label contentItem: Label
@ -106,7 +116,7 @@ Item
id: label id: label
text: marketplaceButton.text text: marketplaceButton.text
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
color: marketplaceButton.hovered ? UM.Theme.getColor("main_window_header_background") : UM.Theme.getColor("primary_text") color: UM.Theme.getColor("primary_text")
width: contentWidth width: contentWidth
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
renderType: Text.NativeRendering renderType: Text.NativeRendering