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

Merge pull request #10365 from Ultimaker/CURA-8498_make_setting_search_magnifier_themable

Browse Source 
Replace the textfield with cura.Textfield
This commit is contained in:
Jelle Spijker 2021-08-30 14:23:40 +02:00 committed by GitHub
commit 374fb78342
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,26 +19,9 @@ Item
property Action configureSettings property Action configureSettings
property bool findingSettings property bool findingSettings
Rectangle Item
{ {
id: filterContainer id: filterContainer
visible: true
radius: UM.Theme.getSize("setting_control_radius").width
border.width: UM.Theme.getSize("default_lining").width
border.color:
{
if (hoverMouseArea.containsMouse || clearFilterButton.containsMouse)
{
return UM.Theme.getColor("setting_control_border_highlight")
}
else
{
return UM.Theme.getColor("setting_control_border")
}
}
color: UM.Theme.getColor("setting_control")
anchors anchors
{ {
@ -48,6 +31,7 @@ Item
rightMargin: UM.Theme.getSize("default_margin").width rightMargin: UM.Theme.getSize("default_margin").width
} }
height: UM.Theme.getSize("print_setup_big_item").height height: UM.Theme.getSize("print_setup_big_item").height
Timer Timer
{ {
id: settingsSearchTimer id: settingsSearchTimer
@ -57,33 +41,35 @@ Item
repeat: false repeat: false
} }
TextField Cura.TextField
{ {
id: filter id: filter
height: parent.height height: parent.height
anchors.left: parent.left anchors.left: parent.left
anchors.right: clearFilterButton.left anchors.right: parent.right
anchors.rightMargin: Math.round(UM.Theme.getSize("thick_margin").width) leftPadding: searchIcon.width + UM.Theme.getSize("default_margin").width * 2
placeholderText: catalog.i18nc("@label:textbox", "Search settings")
placeholderText: font.italic: true
{
var imageSize = "width='" + UM.Theme.getSize("small_button_icon").width + "' height='" + UM.Theme.getSize("small_button_icon").height
var imageSource = "' src='"+ UM.Theme.getIcon("Magnifier")
var searchPlaceholder = catalog.i18nc("@label:textbox", "Search settings")
return "<img align='middle' " + imageSize + imageSource +"'>" + "<div vertical-align=bottom>" + searchPlaceholder
}
style: TextFieldStyle
{
textColor: UM.Theme.getColor("setting_control_text")
placeholderTextColor: UM.Theme.getColor("setting_filter_field")
font: UM.Theme.getFont("default_italic")
background: Item {}
}
property var expandedCategories property var expandedCategories
property bool lastFindingSettings: false property bool lastFindingSettings: false
UM.RecolorImage
{
id: searchIcon
anchors
{
verticalCenter: parent.verticalCenter
left: parent.left
leftMargin: UM.Theme.getSize("default_margin").width
}
source: UM.Theme.getIcon("search")
height: UM.Theme.getSize("small_button_icon").height
width: height
color: UM.Theme.getColor("text")
}
onTextChanged: onTextChanged:
{ {
settingsSearchTimer.restart() settingsSearchTimer.restart()
@ -127,15 +113,6 @@ Item
} }
} }
MouseArea
{
id: hoverMouseArea
anchors.fill: parent
hoverEnabled: true
acceptedButtons: Qt.NoButton
cursorShape: Qt.IBeamCursor
}
UM.SimpleButton UM.SimpleButton
{ {
id: clearFilterButton id: clearFilterButton