Traktor: More fixes to themes.

apistol78 · May 10, 2024 · 267ae97 · 267ae97
1 parent ed5d1f3
commit 267ae97
Show file tree

Hide file tree

Showing 10 changed files with 509 additions and 138 deletions.
diff --git a/code/Ui/DockPane.cpp b/code/Ui/DockPane.cpp
@@ -655,12 +655,12 @@ void DockPane::draw(Canvas& canvas)
 				const bool visible = w.widget->isVisible(false);
 				if (visible)
 				{
-					canvas.setForeground(ss->getColor(this, L"color"));
+					canvas.setForeground(ss->getColor(this, L"tab-color-active"));
 					canvas.setBackground(ss->getColor(this, L"tab-selected-background-color"));
 				}
 				else
 				{
-					canvas.setForeground(ss->getColor(this, L"color-disabled"));
+					canvas.setForeground(ss->getColor(this, L"tab-color-inactive"));
 					canvas.setBackground(ss->getColor(this, L"tab-background-color"));
 				}
 				canvas.fillRect(rcTab);

diff --git a/resources/runtime/themes/Dark/StyleSheet.xss b/resources/runtime/themes/Dark/StyleSheet.xss
@@ -990,6 +990,14 @@
 					<first>tab-selected-background-color</first>
 					<second>0, 122, 204, 255</second>
 				</item>
+				<item>
+					<first>tab-color-active</first>
+					<second>255, 255, 255, 255</second>
+				</item>
+				<item>
+					<first>tab-color-inactive</first>
+					<second>255, 255, 255, 255</second>
+				</item>
 				<item>
 					<first>gripper-color</first>
 					<second>90, 90, 90, 255</second>

diff --git a/resources/runtime/themes/Light/StyleSheet.xss b/resources/runtime/themes/Light/StyleSheet.xss
@@ -7,10 +7,6 @@
 		<item>
 			<typeName>traktor.Object</typeName>
 			<colors>
-				<item>
-					<first>theme-color</first>
-					<second>0, 0, 0, 255</second>
-				</item>
 				<item>
 					<first>background-color</first>
 					<second>239, 239, 242, 255</second>
@@ -39,6 +35,10 @@
 					<first>color-disabled</first>
 					<second>142, 140, 140, 255</second>
 				</item>
+				<item>
+					<first>theme-color</first>
+					<second>0, 0, 0, 255</second>
+				</item>
 			</colors>
 		</item>
 		<item>
@@ -164,18 +164,35 @@
 					<first>caption-color-no-focus</first>
 					<second>30, 30, 30, 255</second>
 				</item>
+			</colors>
+		</item>
+		<item>
+			<typeName>traktor.ui.DockPane</typeName>
+			<colors>
 				<item>
-					<first>gripper-color-focus</first>
-					<second>255, 255, 255, 255</second>
-				</item>
-				<item>
-					<first>gripper-color-no-focus</first>
+					<first>gripper-color</first>
 					<second>160, 160, 160, 255</second>
 				</item>
 				<item>
 					<first>splitter-color</first>
 					<second>204, 200, 219, 255</second>
 				</item>
+				<item>
+					<first>tab-background-color</first>
+					<second>239, 239, 242, 255</second>
+				</item>
+				<item>
+					<first>tab-selected-background-color</first>
+					<second>0, 122, 204, 255</second>
+				</item>
+				<item>
+					<first>tab-color</first>
+					<second>255, 255, 255, 255</second>
+				</item>
+				<item>
+					<first>tab-color-inactive</first>
+					<second>30, 30, 30, 255</second>
+				</item>
 			</colors>
 		</item>
 		<item>

diff --git a/resources/runtime/themes/Monokai/StyleSheet.xss b/resources/runtime/themes/Monokai/StyleSheet.xss
@@ -170,12 +170,20 @@
 				</item>
 				<item>
 					<first>tab-selected-background-color</first>
-					<second>0, 122, 204, 255</second>
+					<second>117, 113, 94, 255</second>
 				</item>
 				<item>
 					<first>gripper-color</first>
 					<second>120, 120, 120, 255</second>
 				</item>
+				<item>
+					<first>tab-color-active</first>
+					<second>255, 255, 255, 255</second>
+				</item>
+				<item>
+					<first>tab-color-inactive</first>
+					<second>255, 255, 255, 255</second>
+				</item>
 			</colors>
 		</item>		
 		<item>

diff --git a/resources/runtime/themes/Orange/StyleSheet.xss b/resources/runtime/themes/Orange/StyleSheet.xss
@@ -194,16 +194,37 @@
 					<first>caption-color-no-focus</first>
 					<second>200, 200, 200, 255</second>
 				</item>
+			</colors>
+		</item>
+		<item>
+			<typeName>traktor.ui.DockPane</typeName>
+			<colors>
+				<item>
+					<first>splitter-color</first>
+					<second>63, 63, 70, 255</second>
+				</item>
+				<item>
+					<first>tab-background-color</first>
+					<second>45, 45, 45, 255</second>
+				</item>
 				<item>
-					<first>gripper-color-no-focus</first>
+					<first>tab-selected-background-color</first>
 					<second>224, 91, 0, 255</second>
 				</item>
 				<item>
-					<first>splitter-color</first>
-					<second>63, 63, 70, 255</second>
+					<first>gripper-color</first>
+					<second>224, 91, 0, 255</second>
+				</item>
+				<item>
+					<first>tab-color-active</first>
+					<second>255, 255, 255, 255</second>
+				</item>
+				<item>
+					<first>tab-color-inactive</first>
+					<second>255, 255, 255, 255</second>
 				</item>
 			</colors>
-		</item>
+		</item>			
 		<item>
 			<typeName>traktor.ui.DropDown</typeName>
 			<colors>

diff --git a/resources/runtime/themes/Shared/Images/Editor/ToolSearch.svg b/resources/runtime/themes/Shared/Images/Editor/ToolSearch.svg