From 330b3f81191f6a5c98896ca734feafaaf9fa23b9 Mon Sep 17 00:00:00 2001
From: "j.delarago" <joeydelarago@gmail.com>
Date: Tue, 1 Mar 2022 10:26:59 +0100
Subject: [PATCH] Update settings visibility pages to have correct background
 color on categories

CURA-8688
---
 plugins/PerObjectSettingsTool/PerObjectCategory.qml | 4 +++-
 plugins/PerObjectSettingsTool/SettingPickDialog.qml | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/plugins/PerObjectSettingsTool/PerObjectCategory.qml b/plugins/PerObjectSettingsTool/PerObjectCategory.qml
index eae74eeb4c..2a0f028d1c 100644
--- a/plugins/PerObjectSettingsTool/PerObjectCategory.qml
+++ b/plugins/PerObjectSettingsTool/PerObjectCategory.qml
@@ -11,7 +11,9 @@ import ".."
 Button {
     id: base;
 
-    background: Item {}
+    background: Rectangle {
+        color: UM.Theme.getColor("background_3")
+    }
 
     contentItem: Row
     {
diff --git a/plugins/PerObjectSettingsTool/SettingPickDialog.qml b/plugins/PerObjectSettingsTool/SettingPickDialog.qml
index 0eb75676eb..d7d8091121 100644
--- a/plugins/PerObjectSettingsTool/SettingPickDialog.qml
+++ b/plugins/PerObjectSettingsTool/SettingPickDialog.qml
@@ -14,6 +14,7 @@ UM.Dialog
 
     title: catalog.i18nc("@title:window", "Select Settings to Customize for this model")
     width: UM.Theme.getSize("small_popup_dialog").width
+    backgroundColor: UM.Theme.getColor("background_1")
 
     property var additional_excluded_settings
 
@@ -78,12 +79,13 @@ UM.Dialog
         anchors
         {
             top: filterInput.bottom
+            topMargin: UM.Theme.getSize("default_margin").height
             left: parent.left
             right: parent.right
             bottom: parent.bottom
         }
 
-        ScrollBar.vertical: UM.ScrollBar {}
+        ScrollBar.vertical: UM.ScrollBar { id: scrollBar }
         clip: true
 
         model: UM.SettingDefinitionsModel
@@ -104,7 +106,7 @@ UM.Dialog
         {
             id: loader
 
-            width: listview.width
+            width: listview.width - scrollBar.width
             height: model.type != undefined ? UM.Theme.getSize("section").height : 0
 
             property var definition: model