fix: color button

julien-wff · Dec 21, 2023 · 04d7d3f · 04d7d3f
1 parent 9294586
commit 04d7d3f
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 7 deletions.
diff --git a/EasyGUI/Controls/Buttons/BaseButton.xaml b/EasyGUI/Controls/Buttons/BaseButton.xaml
@@ -33,7 +33,7 @@
                 <Image Source="{Binding ButtonIcon, RelativeSource={RelativeSource AncestorType=UserControl}}"
                        RenderOptions.BitmapScalingMode="HighQuality"
                        Width="18" Height="18" />
-                <TextBlock Foreground="{StaticResource TextWhiteBrush}"
+                <TextBlock Foreground="{StaticResource ButtonColorBrush}"
                            Text="{Binding ButtonText, RelativeSource={RelativeSource AncestorType=UserControl}}"
                            Margin="10,0,0,0" />
             </StackPanel>

diff --git a/EasyGUI/Controls/Buttons/CancelButton.xaml b/EasyGUI/Controls/Buttons/CancelButton.xaml
@@ -26,7 +26,7 @@
                 </ControlTemplate>
             </Button.Template>
 
-            <TextBlock Foreground="{StaticResource TextWhiteBrush}"
+            <TextBlock Foreground="{StaticResource ButtonColorBrush}"
                        Text="{x:Static resx:Strings.CancelButton_Cancel}"
                        VerticalAlignment="Center"
                        Margin="16,0,16,0" />

diff --git a/EasyGUI/Controls/Buttons/ValidateButton.xaml b/EasyGUI/Controls/Buttons/ValidateButton.xaml
@@ -26,7 +26,7 @@
                 </ControlTemplate>
             </Button.Template>
 
-            <TextBlock Foreground="{StaticResource TextWhiteBrush}"
+            <TextBlock Foreground="{StaticResource ButtonColorBrush}"
                        Text="{x:Static resx:Strings.ValidateButton_Validate}"
                        VerticalAlignment="Center"
                        Margin="16,0,16,0" />

diff --git a/EasyGUI/Resources/GlobalStyles.xaml b/EasyGUI/Resources/GlobalStyles.xaml
@@ -32,7 +32,7 @@
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
-        <Setter Property="Background" Value="{DynamicResource BackgroundBrush}" />
+        <Setter Property="Background" Value="{DynamicResource TextWhiteBrush}" />
         <Setter Property="Foreground" Value="{DynamicResource TextBlackBrush}" />
         <Setter Property="BorderBrush" Value="{DynamicResource DarkGrayBrush}" />
         <Setter Property="BorderThickness" Value="1" />
@@ -60,13 +60,13 @@
                 Grid.Column="0"
                 CornerRadius="6,0,0,6"
                 Margin="1"
-                Background="{DynamicResource BackgroundBrush}"
+                Background="{DynamicResource TextWhiteBrush}"
                 BorderBrush="{DynamicResource DarkGrayBrush}"
                 BorderThickness="0,0,1,0" />
             <Path
                 x:Name="Arrow"
                 Grid.Column="1"
-                Fill="{DynamicResource BackgroundBrush}"
+                Fill="{DynamicResource TextBlackBrush}"
                 HorizontalAlignment="Center"
                 VerticalAlignment="Center"
                 Data="M0,0 L0,2 L4,6 L8,2 L8,0 L4,4 z" />

diff --git a/EasyGUI/Resources/Themes/Dark.xaml b/EasyGUI/Resources/Themes/Dark.xaml
@@ -8,8 +8,11 @@
 
     <Color x:Key="GrayColor">#C1C1C7</Color>
     <SolidColorBrush x:Key="GrayBrush" Color="{StaticResource GrayColor}"/>
+
+    <Color x:Key="ButtonColor">#F7F7FB</Color>
+    <SolidColorBrush x:Key="ButtonColorBrush" Color="{StaticResource ButtonColor}"/>
 
-    <Color x:Key="TextWhiteColor">#F7F7FB</Color>
+    <Color x:Key="TextWhiteColor">#2E2E33</Color>
     <SolidColorBrush x:Key="TextWhiteBrush" Color="{StaticResource TextWhiteColor}"/>
 
     <Color x:Key="TextBlackColor">#F7F7FB</Color>

diff --git a/EasyGUI/Resources/Themes/White.xaml b/EasyGUI/Resources/Themes/White.xaml
@@ -8,6 +8,9 @@
 
     <Color x:Key="GrayColor">#BBB9C6</Color>
     <SolidColorBrush x:Key="GrayBrush" Color="{StaticResource GrayColor}"/>
+
+    <Color x:Key="ButtonColor">#F7F7FB</Color>
+    <SolidColorBrush x:Key="ButtonColorBrush" Color="{StaticResource ButtonColor}"/>
 
     <Color x:Key="TextWhiteColor">#ffffff</Color>
     <SolidColorBrush x:Key="TextWhiteBrush" Color="{StaticResource TextWhiteColor}"/>