完善主题颜色匹配

Planshit · Oct 26, 2023 · 2f14583 · 2f14583
1 parent 59fd696
commit 2f14583
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/UI/Controls/Charts/Charts.cs b/UI/Controls/Charts/Charts.cs
@@ -1215,7 +1215,9 @@ private void RenderColumnStyle()
                 for (int di = 0; di < columnCount; di++)
                 {
                     var item = list[di];
-                    string colColor = item.Color == null ? UI.Base.Color.Colors.MainColors[di] : item.Color;
+                    //string colColor = item.Color == null ? UI.Base.Color.Colors.MainColors[di] : item.Color;
+                    string themeColor = ((System.Windows.Media.Color)Application.Current.Resources["ThemeColor"]).ToString();
+                    string colColor = item.Color == null ? themeColor : item.Color;
                     double value = item.Values[i];
 
 

diff --git a/UI/Themes/Charts/ChartsItemTypeCard.xaml b/UI/Themes/Charts/ChartsItemTypeCard.xaml
@@ -34,7 +34,7 @@
                                         VerticalAlignment="Center"
                                            Margin="0"
                                             RenderTransformOrigin="0.5,0.5"
-                                            Fill="#ff305b"
+                                            Fill="{DynamicResource ThemeBrush}"
 
                             >
                                         <!--<Rectangle.Effect>
@@ -58,7 +58,7 @@
 
                                     <Border VerticalAlignment="Top" CornerRadius="5" Padding="5" HorizontalAlignment="Left" Margin="10" >
                                         <Border.Background>
-                                            <SolidColorBrush Color="#ff305b" Opacity="0.7"/>
+                                            <SolidColorBrush Color="{DynamicResource ThemeColor}" Opacity="0.7"/>
                                         </Border.Background>
                                         <TextBlock x:Name="ValueTextObj" Foreground="White" FontSize="12" />
 

diff --git a/UI/Themes/Charts/ChartsItemTypeMonth.xaml b/UI/Themes/Charts/ChartsItemTypeMonth.xaml
@@ -41,7 +41,7 @@
                                             <Rectangle.Fill>
                                                 <LinearGradientBrush EndPoint="2,1" StartPoint="-2,0">
                                                     <GradientStop Color="Transparent"/>
-                                                    <GradientStop Color="#ff305b" Offset="1"/>
+                                                    <GradientStop Color="{DynamicResource ThemeColor}" Offset="1"/>
                                                 </LinearGradientBrush>
                                             </Rectangle.Fill>
                                         </Rectangle>