Fix dark theme

I don't think this ever worked, seeing as how there were rectangles without colour in there. Use Item instead of a rectangle if it doesn't need a background colour or border colour.
Goodfeat · Apr 28, 2019 · 3d8ffa2 · 3d8ffa2
1 parent 90afe64
commit 3d8ffa2
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/resources/qml/SettingsGuide.qml b/resources/qml/SettingsGuide.qml
@@ -82,8 +82,9 @@ Window {
 		Rectangle {
 			id: rightSideItem
 			width: UM.Theme.getSize("print_setup_widget").width
-			border.color: "black"
+			border.color: UM.Theme.getColor("lining")
 			border.width: 1
+			color: "transparent"
 
 			anchors {
 				top: globalItem.top

diff --git a/resources/qml/SettingsSidebar.qml b/resources/qml/SettingsSidebar.qml
@@ -14,7 +14,7 @@ import Cura 1.0 as Cura
 
 import CuraSettingsGuide 1.0 as CuraSettingsGuideNS
 
-Rectangle {
+Item {
 	id: rightSideItem
 	width: UM.Theme.getSize("print_setup_widget").width
 

diff --git a/resources/qml/SidebarSettingTemplates/EmptyTemplate.qml b/resources/qml/SidebarSettingTemplates/EmptyTemplate.qml
@@ -15,7 +15,7 @@ Rectangle {
 
 	Text {
 		text: "EMPTY"
-		color: "black"
+		color: UM.Theme.getColor("text")
 		font.pixelSize: 80
 		anchors.horizontalCenter: parent.horizontalCenter
 		anchors.verticalCenter: parent.verticalCenter

diff --git a/resources/qml/SidebarSettingTemplates/GeneralTemplate.qml b/resources/qml/SidebarSettingTemplates/GeneralTemplate.qml
@@ -74,6 +74,7 @@ Rectangle {
 
 				text: general_template.setting_name
 				font: UM.Theme.getFont("large")
+				color: UM.Theme.getColor("text")
 				renderType: Text.NativeRendering
 			}
 
@@ -86,6 +87,7 @@ Rectangle {
 				width: rect_scroll.width
 				wrapMode: Text.WordWrap
 				font: UM.Theme.getFont("default")
+				color: UM.Theme.getColor("text")
 				renderType: Text.NativeRendering
 			}
 
@@ -214,6 +216,7 @@ Rectangle {
 				width: rect_scroll.width
 				text: general_template.setting_img_description
 				font: UM.Theme.getFont("default_italic")
+				color: UM.Theme.getColor("text")
 				renderType: Text.NativeRendering
 				wrapMode: Text.WordWrap
 			}
@@ -231,6 +234,7 @@ Rectangle {
 				text: CuraSettingsGuide.parseStylingList(general_template.setting_hints)
 				width: rect_scroll.width
 				font: UM.Theme.getFont("default")
+				color: UM.Theme.getColor("text")
 				renderType: Text.NativeRendering
 				wrapMode: Text.WordWrap
 				textFormat: Text.RichText
@@ -251,6 +255,7 @@ Rectangle {
 				text: general_template.setting_notes
 				width: rect_scroll.width
 				font: UM.Theme.getFont("default_bold")
+				color: UM.Theme.getColor("text")
 				renderType: Text.NativeRendering
 				wrapMode: Text.WordWrap
 			}

diff --git a/resources/qml/SidebarSettings/SettingItem.qml b/resources/qml/SidebarSettings/SettingItem.qml
@@ -11,7 +11,7 @@ import QtQuick.Controls 2.0
 import UM 1.1 as UM
 import Cura 1.0 as Cura
 
-Rectangle {
+Item {
 	id: base
 
 	height: UM.Theme.getSize("section").height