Merge pull request #417 from xoascf/fix-vista-basic-colors

Fix Vista Basic colors (#414)
dremin · Aug 10, 2022 · 6771b81 · 6771b81
2 parents b96ba72 + 2aa80d5
commit 6771b81
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 1 deletion.
diff --git a/RetroBar/Themes/Windows Vista Aero.xaml b/RetroBar/Themes/Windows Vista Aero.xaml
@@ -37,6 +37,10 @@
     <SolidColorBrush x:Key="TaskbarTopInnerBorder" Color="#e59e9e9e" />
     <SolidColorBrush x:Key="TaskbarBottomInnerBorder" Color="#c2000000" />
     <SolidColorBrush x:Key="TaskbarBottomBorder" Color="#f7000000" />
+    <SolidColorBrush x:Key="TaskbarVerticalTopBorder" Color="#e5474747" />
+    <SolidColorBrush x:Key="TaskbarVerticalTopInnerBorder" Color="#e59e9e9e" />
+    <SolidColorBrush x:Key="TaskbarVerticalBottomInnerBorder" Color="#c2000000" />
+    <SolidColorBrush x:Key="TaskbarVerticalBottomBorder" Color="#f7000000" />
 
     <SolidColorBrush x:Key="TrayToggleOuterBorder" Color="#20ffffff" />
     <SolidColorBrush x:Key="TrayToggleBorder" Color="#99000000" />
@@ -384,6 +388,18 @@
                         <DataTrigger Binding="{Binding Path=Orientation, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
                                      Value="Vertical">
                             <DataTrigger.Setters>
+                                <Setter TargetName="TaskbarTopBorder"
+                                        Property="BorderBrush"
+                                        Value="{DynamicResource TaskbarVerticalTopBorder}" />
+                                <Setter TargetName="TaskbarTopInnerBorder"
+                                        Property="BorderBrush"
+                                        Value="{DynamicResource TaskbarVerticalTopInnerBorder}" />
+                                <Setter TargetName="TaskbarBottomBorder"
+                                        Property="BorderBrush"
+                                        Value="{DynamicResource TaskbarVerticalBottomBorder}" />
+                                <Setter TargetName="TaskbarBottomInnerBorder"
+                                        Property="BorderBrush"
+                                        Value="{DynamicResource TaskbarVerticalBottomInnerBorder}" />
                                 <Setter TargetName="TaskbarBottomInnerBorder"
                                         Property="Background"
                                         Value="{DynamicResource TaskbarVerticalBackground}" />
@@ -739,7 +755,7 @@
                 <ControlTemplate TargetType="RepeatButton">
                     <Border BorderThickness="1,0,1,1"
                             BorderBrush="{DynamicResource TaskListScrollButtonOuterBorder}"
-                            CornerRadius="{DynamicResource TaskListScrollUpCornerRadius}"
+                            CornerRadius="{DynamicResource TaskListScrollDownCornerRadius}"
                             x:Name="ButtonOuterBorder">
                         <Border BorderThickness="1,0,1,1"
                                 BorderBrush="{DynamicResource TaskListScrollButtonBorder}"

diff --git a/RetroBar/Themes/Windows Vista Basic.xaml b/RetroBar/Themes/Windows Vista Basic.xaml
@@ -7,5 +7,57 @@
 
     <system:Boolean x:Key="AllowsTransparency">False</system:Boolean>
 
+    <LinearGradientBrush x:Key="TaskbarBackground"
+                         StartPoint="0,0"
+                         EndPoint="0,1">
+        <GradientStop Color="#8B8C8C"
+                      Offset="0.0" />
+        <GradientStop Color="#828383"
+                      Offset="0.15" />
+        <GradientStop Color="#4D4F4F"
+                      Offset="0.45" />
+        <GradientStop Color="#464648"
+                      Offset="0.50" />
+        <GradientStop Color="#1B1D1F"
+                      Offset="0.50" />
+        <GradientStop Color="#181A1B"
+                      Offset="0.80" />
+        <GradientStop Color="#18191B"
+                      Offset="1.0" />
+    </LinearGradientBrush>
+    <LinearGradientBrush x:Key="TaskbarVerticalBackground"
+                         StartPoint="0,0"
+                         EndPoint="1,0">
+        <GradientStop Color="#8B8C8C"
+                      Offset="0.0" />
+        <GradientStop Color="#808182"
+                      Offset="0.05" />
+        <GradientStop Color="#4B4C4D"
+                      Offset="0.15" />
+        <GradientStop Color="#454647"
+                      Offset="0.17" />
+        <GradientStop Color="#181A1C"
+                      Offset="0.171" />
+        <GradientStop Color="#1C1E1F"
+                      Offset="1.0" />
+    </LinearGradientBrush>
     <SolidColorBrush x:Key="TaskbarWindowBackground" Color="#000000" />
+    <SolidColorBrush x:Key="TaskbarTopBorder" Color="#545454" />
+    <SolidColorBrush x:Key="TaskbarTopInnerBorder" Color="#B4B5B5" />
+    <SolidColorBrush x:Key="TaskbarBottomInnerBorder" Color="#17191A" />
+    <SolidColorBrush x:Key="TaskbarBottomBorder" Color="#131415" />
+    <SolidColorBrush x:Key="TaskbarVerticalTopBorder" Color="#545454" />
+    <SolidColorBrush x:Key="TaskbarVerticalTopInnerBorder" Color="#B4B4B4" />
+    <SolidColorBrush x:Key="TaskbarVerticalBottomInnerBorder" Color="#1C1E1F" />
+    <SolidColorBrush x:Key="TaskbarVerticalBottomBorder" Color="#1B1D1F" />
+
+    <CornerRadius x:Key="TaskListScrollUpCornerRadius">0.4,0.4,0,0</CornerRadius>
+    <CornerRadius x:Key="TaskListScrollLeftCornerRadius">0</CornerRadius>
+    <CornerRadius x:Key="TaskListScrollRightCornerRadius">0</CornerRadius>
+
+    <SolidColorBrush x:Key="TaskListScrollButtonOuterBorder" Color="#000000" />
+    <SolidColorBrush x:Key="TaskListScrollButtonBorder" Color="#2D3650" />
+    <SolidColorBrush x:Key="TaskListScrollButtonInnerBorderHover" Color="#73767C" />
+    <SolidColorBrush x:Key="TaskListScrollButtonInnerBorderPressed" Color="#73767C" />
+    <SolidColorBrush x:Key="TaskListScrollButtonBackground" Color="#111218" />
 </ResourceDictionary>