From 307d751c2d47fc1805d4058d6659d7e75ddeb1e7 Mon Sep 17 00:00:00 2001
From: Remco Burema <r.burema@ultimaker.com>
Date: Thu, 18 Nov 2021 08:14:04 +0100
Subject: [PATCH 1/2] Fix white rectangles in dark mode and height of
 search-bar.

part of CURA-8559
---
 plugins/Marketplace/resources/qml/Marketplace.qml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/Marketplace/resources/qml/Marketplace.qml b/plugins/Marketplace/resources/qml/Marketplace.qml
index 124bc7406b..c04aa7eb6a 100644
--- a/plugins/Marketplace/resources/qml/Marketplace.qml
+++ b/plugins/Marketplace/resources/qml/Marketplace.qml
@@ -85,6 +85,7 @@ Window
 
                     Rectangle
                     {
+                        color: "transparent"
                         Layout.preferredHeight: parent.height
                         Layout.preferredWidth: searchBar.visible ? UM.Theme.getSize("thin_margin").width : 0
                         Layout.fillWidth: ! searchBar.visible
@@ -93,7 +94,7 @@ Window
                     Cura.SearchBar
                     {
                         id: searchBar
-                        Layout.preferredHeight: parent.height
+                        Layout.preferredHeight: UM.Theme.getSize("button_icon").height
                         Layout.fillWidth: true
                         onTextEdited: searchStringChanged(text)
                     }
@@ -105,6 +106,7 @@ Window
                         anchors.right: parent.right
                         height: UM.Theme.getSize("button_icon").height
                         spacing: 0
+                        background: Rectangle { color: "transparent" }
 
                         PackageTypeTab
                         {

From cd255b0ae52a8238b8718df1354f4c142ead4aac Mon Sep 17 00:00:00 2001
From: Remco Burema <r.burema@ultimaker.com>
Date: Thu, 18 Nov 2021 08:15:26 +0100
Subject: [PATCH 2/2] Search Marketplace: Change message if no results found.

part of CURA-8559
---
 plugins/Marketplace/resources/qml/Packages.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/Marketplace/resources/qml/Packages.qml b/plugins/Marketplace/resources/qml/Packages.qml
index 5a7f56748a..79b4bf23a5 100644
--- a/plugins/Marketplace/resources/qml/Packages.qml
+++ b/plugins/Marketplace/resources/qml/Packages.qml
@@ -147,7 +147,7 @@ ListView
                         PropertyChanges
                         {
                             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")
                         }
                     }