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

Add hover effect to mode switch text labels

Browse Source
This commit is contained in:
fieldOfView 2017-04-30 23:21:49 +02:00
parent 0c6a5328c8
commit 93197cd173
2 changed files with 39 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
resources/qml/Sidebar.qml
View File

@ -408,18 +408,34 @@ Rectangle
} }
ExclusiveGroup { id: modeMenuGroup; } ExclusiveGroup { id: modeMenuGroup; }
Text Label
{ {
id: toggleLeftText id: toggleLeftText
anchors.right: modeToggleSwitch.left anchors.right: modeToggleSwitch.left
anchors.rightMargin: UM.Theme.getSize("default_margin").width anchors.rightMargin: UM.Theme.getSize("default_margin").width
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
text: "" text: ""
color: UM.Theme.getColor("toggle_active_text") color:
{
if(toggleLeftTextMouseArea.containsMouse)
{
return UM.Theme.getColor("toggle_button_text_hover");
}
else if(!modeToggleSwitch.checked)
{
return UM.Theme.getColor("toggle_button_text_checked");
}
else
{
return UM.Theme.getColor("toggle_button_text");
}
}
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
MouseArea MouseArea
{ {
id: toggleLeftTextMouseArea
hoverEnabled: true
anchors.fill: parent anchors.fill: parent
onClicked: onClicked:
{ {
@ -441,11 +457,11 @@ Rectangle
anchors.rightMargin: UM.Theme.getSize("default_margin").width anchors.rightMargin: UM.Theme.getSize("default_margin").width
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
property alias _hovered: enableSupportMouseArea.containsMouse property bool _hovered: modeToggleSwitchMouseArea.containsMouse || toggleLeftTextMouseArea.containsMouse || toggleRightTextMouseArea.containsMouse
MouseArea MouseArea
{ {
id: enableSupportMouseArea id: modeToggleSwitchMouseArea
anchors.fill: parent anchors.fill: parent
hoverEnabled: true hoverEnabled: true
acceptedButtons: Qt.NoButton acceptedButtons: Qt.NoButton
@ -470,17 +486,33 @@ Rectangle
style: UM.Theme.styles.toggle_button style: UM.Theme.styles.toggle_button
} }
Text Label
{ {
id: toggleRightText id: toggleRightText
anchors.right: parent.right anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
text: "" text: ""
color: UM.Theme.getColor("toggle_active_text") color:
{
if(toggleRightTextMouseArea.containsMouse)
{
return UM.Theme.getColor("toggle_button_text_hover");
}
else if(modeToggleSwitch.checked)
{
return UM.Theme.getColor("toggle_button_text_checked");
}
else
{
return UM.Theme.getColor("toggle_button_text");
}
}
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
MouseArea MouseArea
{ {
id: toggleRightTextMouseArea
hoverEnabled: true
anchors.fill: parent anchors.fill: parent
onClicked: onClicked:
{ {

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

@ -182,7 +182,7 @@
"toggle_button_handle": [24, 41, 77, 255], "toggle_button_handle": [24, 41, 77, 255],
"toggle_button_text": [24, 41, 77, 255], "toggle_button_text": [24, 41, 77, 255],
"toggle_button_text_hover": [24, 41, 77, 255], "toggle_button_text_hover": [24, 41, 77, 255],
"toggle_button_text_selected": [24, 41, 77, 255], "toggle_button_text_checked": [12, 169, 227, 255],
"tooltip": [12, 169, 227, 255], "tooltip": [12, 169, 227, 255],
"tooltip_text": [255, 255, 255, 255], "tooltip_text": [255, 255, 255, 255],