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

Re-enable hover for marketplace button

Browse Source 
CURA-5959
This commit is contained in:
Jaime van Kessel 2018-11-26 13:47:22 +01:00
parent 3c86c0ae6c
commit a654499752
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/Toolbox/resources/qml/ToolboxDetailPage.qml
View File

@ -37,7 +37,7 @@ Item
leftMargin: UM.Theme.getSize("wide_margin").width leftMargin: UM.Theme.getSize("wide_margin").width
topMargin: UM.Theme.getSize("wide_margin").height topMargin: UM.Theme.getSize("wide_margin").height
} }
color: white //Always a white background for image (regardless of theme). color: "white" //Always a white background for image (regardless of theme).
Image Image
{ {
anchors.fill: parent anchors.fill: parent

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

@ -81,10 +81,12 @@ Rectangle
height: Math.round(0.5 * UM.Theme.getSize("main_window_header").height) height: Math.round(0.5 * UM.Theme.getSize("main_window_header").height)
onClicked: Cura.Actions.browsePackages.trigger() onClicked: Cura.Actions.browsePackages.trigger()
hoverEnabled: true
background: Rectangle background: Rectangle
{ {
radius: UM.Theme.getSize("action_button_radius").width radius: UM.Theme.getSize("action_button_radius").width
color: "transparent" color: marketplaceButton.hovered ? UM.Theme.getColor("primary_text") : 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")
} }
@ -93,7 +95,7 @@ Rectangle
{ {
id: label id: label
text: marketplaceButton.text text: marketplaceButton.text
color: UM.Theme.getColor("primary_text") color: marketplaceButton.hovered ? UM.Theme.getColor("main_window_header_background") : UM.Theme.getColor("primary_text")
width: contentWidth width: contentWidth
} }

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

@ -80,7 +80,7 @@
"thick_lining": [127, 127, 127, 255], "thick_lining": [127, 127, 127, 255],
"lining": [192, 193, 194, 255], "lining": [192, 193, 194, 255],
"viewport_overlay": [0, 0, 0, 192], "viewport_overlay": [0, 0, 0, 192],
"primary": [50, 130, 255, 255], "primary": [50, 130, 255, 255],
"primary_shadow": [64, 47, 205, 255], "primary_shadow": [64, 47, 205, 255],
"primary_hover": [48, 182, 231, 255], "primary_hover": [48, 182, 231, 255],