From 5f38dc9640d7169b9ea166765ff1947a0d63a684 Mon Sep 17 00:00:00 2001
From: Sam Johnson <sam@scj.me>
Date: Sun, 1 Dec 2024 02:41:02 -0600
Subject: [PATCH] Fix Vista Classic multi-row clock, add System Vista (#718)

---
 RetroBar/Themes/System Vista.xaml          | 26 +++++++++++++++++++
 RetroBar/Themes/Windows Vista Classic.xaml | 30 ++--------------------
 2 files changed, 28 insertions(+), 28 deletions(-)
 create mode 100644 RetroBar/Themes/System Vista.xaml

diff --git a/RetroBar/Themes/System Vista.xaml b/RetroBar/Themes/System Vista.xaml
new file mode 100644
index 00000000..70da27c8
--- /dev/null
+++ b/RetroBar/Themes/System Vista.xaml	
@@ -0,0 +1,26 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="System XP.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <BitmapImage x:Key="StartIconImage"
+                 UriSource="../Resources/startvistaclassic.png" />
+
+    <ToolTip x:Key="StartButtonTip"
+             Content="{DynamicResource start_button_tip_vista}" />
+
+    <Style TargetType="Image"
+           x:Key="StartIcon"
+           BasedOn="{StaticResource StartIcon}">
+        <Setter Property="Margin"
+                Value="-2,0,1,0" />
+    </Style>
+
+    <Style TargetType="TextBlock"
+           x:Key="StartLabel"
+           BasedOn="{StaticResource StartLabel}">
+        <Setter Property="Margin"
+                Value="0,0,0,1" />
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/RetroBar/Themes/Windows Vista Classic.xaml b/RetroBar/Themes/Windows Vista Classic.xaml
index ddcc7f83..3cea9e9a 100644
--- a/RetroBar/Themes/Windows Vista Classic.xaml	
+++ b/RetroBar/Themes/Windows Vista Classic.xaml	
@@ -1,33 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="Windows XP Classic.xaml" />
+        <ResourceDictionary Source="Windows 2000.xaml" />
+        <ResourceDictionary Source="System Vista.xaml" />
     </ResourceDictionary.MergedDictionaries>
-
-    <BitmapImage x:Key="StartIconImage"
-                 UriSource="../Resources/startvistaclassic.png" />
-
-    <ToolTip x:Key="StartButtonTip"
-             Content="{DynamicResource start_button_tip_vista}" />
-
-    <Style TargetType="Image"
-           x:Key="StartIcon"
-           BasedOn="{StaticResource StartIcon}">
-        <Setter Property="Margin"
-                Value="-2,0,1,0" />
-    </Style>
-
-    <Style TargetType="TextBlock"
-           x:Key="StartLabel"
-           BasedOn="{StaticResource StartLabel}">
-        <Setter Property="Margin"
-                Value="0,0,0,1" />
-    </Style>
-    
-    <Style TargetType="TextBlock"
-           x:Key="Clock"
-           BasedOn="{StaticResource Clock}">
-        <Setter Property="Margin"
-                Value="3,-1,5,0" />
-    </Style>
 </ResourceDictionary>
\ No newline at end of file