From 4346a0f009b265a848f1123aedc6f58980561e0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaro=20Mart=C3=ADnez?= <xoas@airmail.cc>
Date: Mon, 21 Mar 2022 17:40:12 -0500
Subject: [PATCH 1/2] Add Windows Vista Classic Theme

Fixes #255.
Moved styles from Windows XP Classic to System XP.
Also added file globbing for the theme resources in the project file.
---
 RetroBar/Resources/startvistaclassic.png   | Bin 0 -> 862 bytes
 RetroBar/RetroBar.csproj                   |  31 +++----------------
 RetroBar/Themes/System XP.xaml             |  29 ++++++++++++++++++
 RetroBar/Themes/System.xaml                |  20 ++++++++++++-
 RetroBar/Themes/Windows 2000.xaml          |   7 +++++
 RetroBar/Themes/Windows 95-98.xaml         |   6 ++++
 RetroBar/Themes/Windows Me.xaml            |  13 ++++++++
 RetroBar/Themes/Windows Vista Classic.xaml |  33 +++++++++++++++++++++
 RetroBar/Themes/Windows XP Classic.xaml    |  33 +--------------------
 9 files changed, 112 insertions(+), 60 deletions(-)
 create mode 100644 RetroBar/Resources/startvistaclassic.png
 create mode 100644 RetroBar/Themes/Windows Vista Classic.xaml

diff --git a/RetroBar/Resources/startvistaclassic.png b/RetroBar/Resources/startvistaclassic.png
new file mode 100644
index 0000000000000000000000000000000000000000..00d679ff3d317ba331a5b4e6fbae2b82068e7766
GIT binary patch
literal 862
zcmV-k1EKthP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000id
z000id0mpBsWB>pI5J^NqR5;6hlWRy*aTvx|bT8;)1r<SsdC5&gDlARtW_E$3LV~0|
z7^EOV5nY5R6m6A3W@Rfc6`Hk3UAeZix#_f%wUuj^Gp*HD%PzY$Z8^7jdFp>+Lkjxv
zob&(ie}C`uKIc6g0GyC~KHt>0m(R35+p!Wv#)AFudc8Bo-uYYM!|3SfI4fi1(HobI
zX!k@yw=Wt@b~JjjV*U#W9|D2Eq^{d#1x$7f-W`jBwUCPsC2{z6Eej@-DfW_lH>fT_
z7&b64Fs)2fY6=6~ZucDBnM|4#ek$kT>#cY=?sDN$T?0+iYb#YdabBE?BeiR=_ev6y
z3s>W6b45+qzNOp9vlJ%!KMUgFY>LNsIS)VNTu>C1_C$9U4eA_Jx9wsfdAHVLdubAy
zTOa3!?RN{ykAJ(623Jic+_fp_S1y6KBN+;XVuPZG59;+v2s^V;q1cK7VKNR>tpA}_
zt5=27Hy8}umX?-{5{V?8NGuj_>+iS<l}eSWvkA~<EP_ar&$=jTN`XLJq9oa{0K3b*
zAmMh8KcoI5is|nVT8F{7M%iLAzvvYoPv4var9X;0bS6%VQt?1mS8TJ{7IT8Z;6#B^
zm$&4)7FqXuz*l}kgWd^=B?zrnn?SnA<?>C+*NqT8uR;TT9a5=ui$<ea>G61GamXV>
zprRtmG}vCt;Dp$UN{xes5CB{cfv@-3Fv)1-?NDE&dwY8q4Gj%V;Jmkfh+24>`Z>F_
z6Wp6R*2O8=7m%(bq=2m&{&(jQd~+P=&cLub9%f|`-{Ek~V;4yvQRhxSEJ8$48;Fa9
z8w^MmWcFcGK3f<x9m0?y9m8FT2*{%Fl9ujtI-PS_Ku%TbBbiLLIh1^K`3n|80AM!%
zDb%fFJCkDjy(B9cZE$dK3JYKuW`$m_=aI08Wn!JkV<-VSV_A_xpJ+LL)-8kS-obja
z*&I1CGBTb8^!4@44AID*TP&8Pqyzbc#8rPsF1(Ei=&S#or!)uc?d|LAcKiH)ex|Vs
ofkKW#%S9HAIQ9GelS6lZ0siyHd_S9*g8%>k07*qoM6N<$f}9VD761SM

literal 0
HcmV?d00001

diff --git a/RetroBar/RetroBar.csproj b/RetroBar/RetroBar.csproj
index 3404c247..1026f2df 100644
--- a/RetroBar/RetroBar.csproj
+++ b/RetroBar/RetroBar.csproj
@@ -14,6 +14,10 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <None Include="Resources\**">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <SubType>Designer</SubType>
+    </None>
     <None Include="Languages\*.xaml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <SubType>Designer</SubType>
@@ -59,33 +63,6 @@
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
-    <None Update="Resources\startxpblue.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Resources\startnoir.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Resources\startxpbluebutton.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Resources\startxpclassic.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Resources\startxpembeddedbutton.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-	  <None Update="Resources\startxpgreenbutton.png">
-		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-	  </None>
-    <None Update="Resources\startxproyalebutton.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Resources\startxpsilverbutton.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="Resources\startxpzunebutton.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
   </ItemGroup>
 
 </Project>
\ No newline at end of file
diff --git a/RetroBar/Themes/System XP.xaml b/RetroBar/Themes/System XP.xaml
index 9d61da35..8b66ca20 100644
--- a/RetroBar/Themes/System XP.xaml	
+++ b/RetroBar/Themes/System XP.xaml	
@@ -1,5 +1,34 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="ButtonInnerHighlight" Color="Transparent" />
+
     <BitmapImage x:Key="StartIconImage"
                  UriSource="../Resources/startxpclassic.png" />
+
+    <Style TargetType="Image"
+           x:Key="StartIcon"
+           BasedOn="{StaticResource StartIcon}">
+        <Setter Property="Margin"
+                Value="-2,0,2,0" />
+    </Style>
+
+    <Style TargetType="TextBlock"
+           x:Key="StartLabel"
+           BasedOn="{StaticResource StartLabel}">
+        <Setter Property="Margin"
+                Value="0,0,-1,1" />
+    </Style>
+
+    <Style TargetType="MenuItem"
+           x:Key="TaskManMenuItem">
+        <Setter Property="Header"
+                Value="{DynamicResource show_taskman}" />
+    </Style>
+
+    <Style TargetType="TextBlock"
+           x:Key="Clock"
+           BasedOn="{StaticResource Clock}">
+        <Setter Property="Margin"
+                Value="5,-1,5,0" />
+    </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/RetroBar/Themes/System.xaml b/RetroBar/Themes/System.xaml
index 2d8c5c22..e163d02a 100644
--- a/RetroBar/Themes/System.xaml
+++ b/RetroBar/Themes/System.xaml
@@ -462,6 +462,18 @@
         </Style.Triggers>
     </Style>
 
+    <Style x:Key="ClassicFocusVisual">
+        <Setter Property="Control.Template">
+            <Setter.Value>
+                <ControlTemplate>
+                    <Rectangle RenderOptions.EdgeMode="Aliased" Margin="5" StrokeThickness="1"
+                               Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"
+                               StrokeDashOffset="1.5" StrokeDashArray="1" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
     <ToolTip x:Key="StartButtonTip" Content="{DynamicResource start_button_tip}" />
 
     <Style TargetType="ToggleButton"
@@ -495,7 +507,7 @@
                                             Background="{TemplateBinding Background}"
                                             Padding="2,1"
                                             x:Name="ButtonInnerTopBorder">
-                                        <ContentPresenter />
+                                        <ContentPresenter Name="Content" />
                                     </Border>
                                 </Border>
                             </Border>
@@ -516,6 +528,9 @@
                             <Setter TargetName="ButtonInnerTopBorder"
                                     Property="BorderBrush"
                                     Value="{DynamicResource ButtonShadow}" />
+                            <Setter TargetName="Content"
+                                    Property="Margin"
+                                    Value="1,1,-1,-1" />
                         </Trigger>
                         <Trigger Property="IsPressed"
                                  Value="True">
@@ -531,6 +546,9 @@
                             <Setter TargetName="ButtonInnerTopBorder"
                                     Property="BorderBrush"
                                     Value="{DynamicResource ButtonShadow}" />
+                            <Setter TargetName="Content"
+                                    Property="Margin"
+                                    Value="1,1,-1,-1" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
diff --git a/RetroBar/Themes/Windows 2000.xaml b/RetroBar/Themes/Windows 2000.xaml
index eb2fbcfc..9e503bd7 100644
--- a/RetroBar/Themes/Windows 2000.xaml	
+++ b/RetroBar/Themes/Windows 2000.xaml	
@@ -18,5 +18,12 @@
     <SolidColorBrush x:Key="ToolTipBackground" Color="#FFFFE1" />
     <SolidColorBrush x:Key="ToolTipForeground" Color="#000000" />
 
+    <Style TargetType="TextBlock"
+           x:Key="StartLabel"
+           BasedOn="{StaticResource StartLabel}">
+        <Setter Property="Margin"
+                Value="0,-1,0,0" />
+    </Style>
+
     <FontFamily x:Key="GlobalFontFamily">Tahoma</FontFamily>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/RetroBar/Themes/Windows 95-98.xaml b/RetroBar/Themes/Windows 95-98.xaml
index c7aaa3a4..1c3f18b3 100644
--- a/RetroBar/Themes/Windows 95-98.xaml	
+++ b/RetroBar/Themes/Windows 95-98.xaml	
@@ -20,5 +20,11 @@
 
     <ToolTip x:Key="StartButtonTip" Content="{DynamicResource start_button_tip_98}" />
 
+    <Style TargetType="ToggleButton"
+           x:Key="StartButton"
+           BasedOn="{StaticResource StartButton}">
+        <Setter Property="FocusVisualStyle" Value="{StaticResource ClassicFocusVisual}" />
+    </Style>
+
     <FontFamily x:Key="GlobalFontFamily">Microsoft Sans Serif</FontFamily>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/RetroBar/Themes/Windows Me.xaml b/RetroBar/Themes/Windows Me.xaml
index 23420984..5318d73d 100644
--- a/RetroBar/Themes/Windows Me.xaml	
+++ b/RetroBar/Themes/Windows Me.xaml	
@@ -4,5 +4,18 @@
         <ResourceDictionary Source="Windows 2000.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
+    <Style TargetType="TextBlock"
+           x:Key="StartLabel"
+           BasedOn="{StaticResource StartLabel}">
+        <Setter Property="Margin"
+                Value="0,-1,1,0" />
+    </Style>
+
+    <Style TargetType="ToggleButton"
+           x:Key="StartButton"
+           BasedOn="{StaticResource StartButton}">
+        <Setter Property="FocusVisualStyle" Value="{StaticResource ClassicFocusVisual}" />
+    </Style>
+
     <FontFamily x:Key="GlobalFontFamily">Microsoft Sans Serif</FontFamily>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/RetroBar/Themes/Windows Vista Classic.xaml b/RetroBar/Themes/Windows Vista Classic.xaml
new file mode 100644
index 00000000..4fbb300a
--- /dev/null
+++ b/RetroBar/Themes/Windows Vista Classic.xaml	
@@ -0,0 +1,33 @@
+<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.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
diff --git a/RetroBar/Themes/Windows XP Classic.xaml b/RetroBar/Themes/Windows XP Classic.xaml
index 5acd18f0..b6a62e07 100644
--- a/RetroBar/Themes/Windows XP Classic.xaml	
+++ b/RetroBar/Themes/Windows XP Classic.xaml	
@@ -2,37 +2,6 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="Windows 2000.xaml" />
+        <ResourceDictionary Source="System XP.xaml" />
     </ResourceDictionary.MergedDictionaries>
-
-    <SolidColorBrush x:Key="ButtonInnerHighlight" Color="Transparent" />
-
-    <BitmapImage x:Key="StartIconImage"
-                 UriSource="../Resources/startxpclassic.png" />
-
-    <Style TargetType="Image"
-           x:Key="StartIcon"
-           BasedOn="{StaticResource StartIcon}">
-        <Setter Property="Margin"
-                Value="-2,0,2,0" />
-    </Style>
-
-    <Style TargetType="TextBlock"
-           x:Key="StartLabel"
-           BasedOn="{StaticResource StartLabel}">
-        <Setter Property="Margin"
-                Value="0,0,-1,1" />
-    </Style>
-
-    <Style TargetType="MenuItem"
-           x:Key="TaskManMenuItem">
-        <Setter Property="Header"
-                Value="{DynamicResource show_taskman}" />
-    </Style>
-
-    <Style TargetType="TextBlock"
-           x:Key="Clock"
-           BasedOn="{StaticResource Clock}">
-        <Setter Property="Margin"
-                Value="5,-1,5,0" />
-    </Style>
 </ResourceDictionary>
\ No newline at end of file

From 30873b7ae477555fcc348c21589a674c5a00a514 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Amaro=20Mart=C3=ADnez?= <xoas@airmail.cc>
Date: Mon, 21 Mar 2022 20:16:39 -0500
Subject: [PATCH 2/2] Null FocusVisualStyle for System and XP themes

---
 RetroBar/Themes/System.xaml          | 2 ++
 RetroBar/Themes/Windows 95-98.xaml   | 3 ++-
 RetroBar/Themes/Windows Me.xaml      | 3 ++-
 RetroBar/Themes/Windows XP Blue.xaml | 2 ++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/RetroBar/Themes/System.xaml b/RetroBar/Themes/System.xaml
index e163d02a..ac18fe13 100644
--- a/RetroBar/Themes/System.xaml
+++ b/RetroBar/Themes/System.xaml
@@ -488,6 +488,8 @@
                 Value="0,0,2,0" />
         <Setter Property="HorizontalAlignment"
                 Value="Left" />
+        <Setter Property="FocusVisualStyle"
+                Value="{x:Null}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ToggleButton">
diff --git a/RetroBar/Themes/Windows 95-98.xaml b/RetroBar/Themes/Windows 95-98.xaml
index 1c3f18b3..a1e8601a 100644
--- a/RetroBar/Themes/Windows 95-98.xaml	
+++ b/RetroBar/Themes/Windows 95-98.xaml	
@@ -23,7 +23,8 @@
     <Style TargetType="ToggleButton"
            x:Key="StartButton"
            BasedOn="{StaticResource StartButton}">
-        <Setter Property="FocusVisualStyle" Value="{StaticResource ClassicFocusVisual}" />
+        <Setter Property="FocusVisualStyle"
+                Value="{StaticResource ClassicFocusVisual}" />
     </Style>
 
     <FontFamily x:Key="GlobalFontFamily">Microsoft Sans Serif</FontFamily>
diff --git a/RetroBar/Themes/Windows Me.xaml b/RetroBar/Themes/Windows Me.xaml
index 5318d73d..a114eee0 100644
--- a/RetroBar/Themes/Windows Me.xaml	
+++ b/RetroBar/Themes/Windows Me.xaml	
@@ -14,7 +14,8 @@
     <Style TargetType="ToggleButton"
            x:Key="StartButton"
            BasedOn="{StaticResource StartButton}">
-        <Setter Property="FocusVisualStyle" Value="{StaticResource ClassicFocusVisual}" />
+        <Setter Property="FocusVisualStyle"
+                Value="{StaticResource ClassicFocusVisual}" />
     </Style>
 
     <FontFamily x:Key="GlobalFontFamily">Microsoft Sans Serif</FontFamily>
diff --git a/RetroBar/Themes/Windows XP Blue.xaml b/RetroBar/Themes/Windows XP Blue.xaml
index 9d9e9925..42d1797c 100644
--- a/RetroBar/Themes/Windows XP Blue.xaml	
+++ b/RetroBar/Themes/Windows XP Blue.xaml	
@@ -1167,6 +1167,8 @@
                 Value="99" />
         <Setter Property="Height"
                 Value="32" />
+        <Setter Property="FocusVisualStyle"
+                Value="{x:Null}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ToggleButton">