From b2bed4efdd56de19a9979cc94e61211b6ae5f38a Mon Sep 17 00:00:00 2001
From: "j.delarago" <joeydelarago@gmail.com>
Date: Wed, 2 Mar 2022 09:06:47 +0100
Subject: [PATCH] Fix setting visibility styling working in one theme and not
 the other.

CURA-8688
---
 plugins/DigitalLibrary/resources/qml/Table.qml      | 3 ++-
 plugins/PerObjectSettingsTool/PerObjectCategory.qml | 8 ++++----
 resources/themes/cura-dark/theme.json               | 2 ++
 resources/themes/cura-light/theme.json              | 2 ++
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/plugins/DigitalLibrary/resources/qml/Table.qml b/plugins/DigitalLibrary/resources/qml/Table.qml
index 0f539675a0..c4aafc1ce4 100644
--- a/plugins/DigitalLibrary/resources/qml/Table.qml
+++ b/plugins/DigitalLibrary/resources/qml/Table.qml
@@ -35,7 +35,8 @@ Item
             model: columnHeaders
             Rectangle
             {
-                width: Math.max(1, Math.round(tableBase.width / headerRepeater.count))
+                //minimumWidth: Math.max(1, Math.round(tableBase.width / headerRepeater.count))
+                width: 300
                 height: UM.Theme.getSize("section").height
 
                 color: UM.Theme.getColor("secondary")
diff --git a/plugins/PerObjectSettingsTool/PerObjectCategory.qml b/plugins/PerObjectSettingsTool/PerObjectCategory.qml
index 2a0f028d1c..3d0b1d826e 100644
--- a/plugins/PerObjectSettingsTool/PerObjectCategory.qml
+++ b/plugins/PerObjectSettingsTool/PerObjectCategory.qml
@@ -12,7 +12,7 @@ Button {
     id: base;
 
     background: Rectangle {
-        color: UM.Theme.getColor("background_3")
+        color: UM.Theme.getColor("category_background")
     }
 
     contentItem: Row
@@ -31,7 +31,7 @@ Button {
                 height: (label.height / 2) | 0
                 width: height
                 source: base.checked ? UM.Theme.getIcon("ChevronSingleDown") : UM.Theme.getIcon("ChevronSingleRight")
-                color: base.hovered ? UM.Theme.getColor("primary_button_hover"): UM.Theme.getColor("primary_button_text")
+                color: base.hovered ? UM.Theme.getColor("primary_button_hover"): UM.Theme.getColor("text")
             }
         }
         UM.RecolorImage
@@ -40,14 +40,14 @@ Button {
             height: label.height
             width: height
             source: UM.Theme.getIcon(definition.icon)
-            color: base.hovered ? UM.Theme.getColor("primary_button_hover") : UM.Theme.getColor("primary_button_text")
+            color: base.hovered ? UM.Theme.getColor("primary_button_hover") : UM.Theme.getColor("text")
         }
         UM.Label
         {
             id: label
             anchors.verticalCenter: parent.verticalCenter
             text: base.text
-            color: base.hovered ? UM.Theme.getColor("primary_button_hover") : UM.Theme.getColor("primary_button_text")
+            color: base.hovered ? UM.Theme.getColor("primary_button_hover") : UM.Theme.getColor("text")
             font.bold: true
         }
     }
diff --git a/resources/themes/cura-dark/theme.json b/resources/themes/cura-dark/theme.json
index 91d742a83b..8f45471344 100644
--- a/resources/themes/cura-dark/theme.json
+++ b/resources/themes/cura-dark/theme.json
@@ -164,6 +164,8 @@
         "checkbox_text": "text_default",
         "checkbox_disabled": "background_2",
 
+        "category_background": "background_3",
+
         "tooltip": "background_2",
         "tooltip_text": "text_default",
 
diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json
index 09edaf6a57..ba18e5d0d2 100644
--- a/resources/themes/cura-light/theme.json
+++ b/resources/themes/cura-light/theme.json
@@ -332,6 +332,8 @@
         "checkbox_disabled": "background_2",
         "checkbox_text": [0, 12, 26, 255],
 
+        "category_background": "background_2",
+
         "tooltip": [25, 25, 25, 255],
         "tooltip_text": [255, 255, 255, 255],