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

Chaged settings visibility icon

Browse Source 
CURA-5941
This commit is contained in:
Aleksei S 2018-11-30 18:33:53 +01:00
parent 73568d7473
commit 29b7f42e0e
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
resources/qml/Settings/SettingView.qml
View File

@ -1,4 +1,4 @@
// Copyright (c) 2017 Ultimaker B.V. // Copyright (c) 2018 Ultimaker B.V.
// Uranium is released under the terms of the LGPLv3 or higher. // Uranium is released under the terms of the LGPLv3 or higher.
import QtQuick 2.7 import QtQuick 2.7
@ -25,13 +25,15 @@ Item
{ {
id: settingVisibilityMenu id: settingVisibilityMenu
property var toolButtonIconColor: UM.Theme.getColor("setting_category_text")
width: height width: height
height: UM.Theme.getSize("setting_control").height height: UM.Theme.getSize("setting_control").height
anchors anchors
{ {
topMargin: UM.Theme.getSize("thick_margin").height topMargin: UM.Theme.getSize("thick_margin").height
right: parent.right left: filterContainer.right
rightMargin: UM.Theme.getSize("thick_margin").width leftMargin: UM.Theme.getSize("default_margin").width
} }
style: ButtonStyle style: ButtonStyle
{ {
@ -39,12 +41,12 @@ Item
UM.RecolorImage { UM.RecolorImage {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
width: UM.Theme.getSize("standard_arrow").width width: Math.round(parent.width * 0.6)
height: UM.Theme.getSize("standard_arrow").height height: Math.round(parent.height * 0.6)
sourceSize.width: width sourceSize.width: width
sourceSize.height: width sourceSize.height: width
color: control.enabled ? UM.Theme.getColor("setting_category_text") : UM.Theme.getColor("setting_category_disabled_text") color: settingVisibilityMenu.toolButtonIconColor
source: UM.Theme.getIcon("menu") source: UM.Theme.getIcon("settings")
} }
} }
label: Label{} label: Label{}
@ -57,6 +59,15 @@ Item
filter.updateDefinitionModel(); filter.updateDefinitionModel();
} }
} }
MouseArea
{
anchors.fill: parent
hoverEnabled: true
acceptedButtons: Qt.RightButton
onEntered: settingVisibilityMenu.toolButtonIconColor = UM.Theme.getColor("setting_control_button_hover")
onExited: settingVisibilityMenu.toolButtonIconColor = UM.Theme.getColor("setting_category_text")
}
} }
Rectangle Rectangle
@ -84,8 +95,8 @@ Item
topMargin: UM.Theme.getSize("thick_margin").height topMargin: UM.Theme.getSize("thick_margin").height
left: parent.left left: parent.left
leftMargin: UM.Theme.getSize("default_margin").width leftMargin: UM.Theme.getSize("default_margin").width
right: settingVisibilityMenu.left right: scrollView.right
rightMargin: Math.floor(UM.Theme.getSize("default_margin").width / 2) rightMargin: Math.floor(UM.Theme.getSize("wide_margin").width * 2)
} }
height: UM.Theme.getSize("setting_control").height height: UM.Theme.getSize("setting_control").height
Timer Timer
@ -196,6 +207,7 @@ Item
ScrollView ScrollView
{ {
id: scrollView
anchors.top: filterContainer.bottom; anchors.top: filterContainer.bottom;
anchors.bottom: parent.bottom; anchors.bottom: parent.bottom;
anchors.right: parent.right; anchors.right: parent.right;