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

Merge pull request #10871 from Ultimaker/CURA-8559_mp_searchbar_fixes

Browse Source 
[CURA-8559] (New-)Marketplace Search-Bar UX Fixes
This commit is contained in:
Jelle Spijker 2021-11-18 11:47:53 +01:00 committed by GitHub
commit 0fb78126d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/Marketplace/resources/qml/Marketplace.qml
View File

@ -85,6 +85,7 @@ Window
Rectangle Rectangle
{ {
color: "transparent"
Layout.preferredHeight: parent.height Layout.preferredHeight: parent.height
Layout.preferredWidth: searchBar.visible ? UM.Theme.getSize("thin_margin").width : 0 Layout.preferredWidth: searchBar.visible ? UM.Theme.getSize("thin_margin").width : 0
Layout.fillWidth: ! searchBar.visible Layout.fillWidth: ! searchBar.visible
@ -93,7 +94,7 @@ Window
Cura.SearchBar Cura.SearchBar
{ {
id: searchBar id: searchBar
Layout.preferredHeight: parent.height Layout.preferredHeight: UM.Theme.getSize("button_icon").height
Layout.fillWidth: true Layout.fillWidth: true
onTextEdited: searchStringChanged(text) onTextEdited: searchStringChanged(text)
} }
@ -105,6 +106,7 @@ Window
anchors.right: parent.right anchors.right: parent.right
height: UM.Theme.getSize("button_icon").height height: UM.Theme.getSize("button_icon").height
spacing: 0 spacing: 0
background: Rectangle { color: "transparent" }
PackageTypeTab PackageTypeTab
{ {

2
plugins/Marketplace/resources/qml/Packages.qml
View File

@ -147,7 +147,7 @@ ListView
PropertyChanges PropertyChanges
{ {
target: loadMoreLabel target: loadMoreLabel
text: catalog.i18nc("@button", "No more results to load") text: packages.model.count > 0 ? catalog.i18nc("@message", "No more results to load") : catalog.i18nc("@message", "No results found with current filter")
color: UM.Theme.getColor("action_button_disabled_text") color: UM.Theme.getColor("action_button_disabled_text")
} }
} }