调整一些控件在深色模式下的显示效果

Planshit · Oct 24, 2021 · 26935e3 · 26935e3
1 parent 6e0e7ba
commit 26935e3
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 3 deletions.
diff --git a/src/Local/ProjectEye/Resources/Themes/Dark/Button.xaml b/src/Local/ProjectEye/Resources/Themes/Dark/Button.xaml
@@ -131,6 +131,9 @@
                         Padding="{TemplateBinding Padding}"
 
                         >
+                        <Border.Effect>
+                            <DropShadowEffect x:Name="Shadow" BlurRadius="20" Direction="0" ShadowDepth="0" Opacity="0" RenderingBias="Performance" Color="{DynamicResource ThemeColor}"></DropShadowEffect>
+                        </Border.Effect>
                         <TextBlock.Foreground>
                             <SolidColorBrush Color="#2f2e41"/>
                         </TextBlock.Foreground>
@@ -186,6 +189,29 @@
 
 
                     </Border>
+                    <ControlTemplate.Triggers>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsMouseOver" Value="True" />
+                            </MultiTrigger.Conditions>
+                            <MultiTrigger.EnterActions>
+                                <BeginStoryboard>
+                                    <Storyboard>
+                                        <DoubleAnimation Duration="0:0:0.15"
+                    Storyboard.TargetProperty="Opacity" Storyboard.TargetName="Shadow" To=".8" />
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </MultiTrigger.EnterActions>
+                            <MultiTrigger.ExitActions>
+                                <BeginStoryboard>
+                                    <Storyboard>
+                                        <DoubleAnimation Duration="0:0:0.15"
+                    Storyboard.TargetProperty="Opacity" Storyboard.TargetName="Shadow" To="0" />
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </MultiTrigger.ExitActions>
+                        </MultiTrigger>
+                    </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
@@ -224,11 +250,12 @@
                         Padding="{TemplateBinding Padding}"
 
                         >
+
                         <Border.Background>
                             <SolidColorBrush x:Name="ButtonBackground" Color="{DynamicResource ThemeColor}" Opacity="1"/>
                         </Border.Background>
                         <Border.Effect>
-                            <DropShadowEffect x:Name="ButtonEffect" Direction="270" ShadowDepth="4" BlurRadius="10.8" Opacity="0"/>
+                            <DropShadowEffect x:Name="Shadow" BlurRadius="20" Direction="0" ShadowDepth="0" Opacity="0" RenderingBias="Performance" Color="{DynamicResource ThemeColor}"></DropShadowEffect>
                         </Border.Effect>
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
@@ -275,6 +302,29 @@
                         </Grid>
 
                     </Border>
+                    <ControlTemplate.Triggers>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsMouseOver" Value="True" />
+                            </MultiTrigger.Conditions>
+                            <MultiTrigger.EnterActions>
+                                <BeginStoryboard>
+                                    <Storyboard>
+                                        <DoubleAnimation Duration="0:0:0.15"
+                    Storyboard.TargetProperty="Opacity" Storyboard.TargetName="Shadow" To=".8" />
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </MultiTrigger.EnterActions>
+                            <MultiTrigger.ExitActions>
+                                <BeginStoryboard>
+                                    <Storyboard>
+                                        <DoubleAnimation Duration="0:0:0.15"
+                    Storyboard.TargetProperty="Opacity" Storyboard.TargetName="Shadow" To="0" />
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </MultiTrigger.ExitActions>
+                        </MultiTrigger>
+                    </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>

diff --git a/src/Local/ProjectEye/Resources/Themes/Dark/ContentCard.xaml b/src/Local/ProjectEye/Resources/Themes/Dark/ContentCard.xaml
@@ -32,7 +32,7 @@
                                 <ScaleTransform x:Name="Scale" ScaleX="0.99" ScaleY="0.99"/>
                             </Border.RenderTransform>
                             <Border.Effect>
-                                <DropShadowEffect x:Name="Shadow" BlurRadius="30" Direction="0" ShadowDepth="0" Opacity="0" RenderingBias="Performance" ></DropShadowEffect>
+                                <DropShadowEffect x:Name="Shadow" BlurRadius="30" Direction="0" ShadowDepth="0" Opacity="0" RenderingBias="Performance" Color="{DynamicResource ThemeColor}" ></DropShadowEffect>
                             </Border.Effect>
                             <ContentPresenter 
                             RecognizesAccessKey="True" Margin="0" 
@@ -52,7 +52,7 @@
                                 <BeginStoryboard>
                                     <Storyboard>
                                         <DoubleAnimation Duration="0:0:0.15"
-                    Storyboard.TargetProperty="Opacity" Storyboard.TargetName="Shadow" To=".1" />
+                    Storyboard.TargetProperty="Opacity" Storyboard.TargetName="Shadow" To=".3" />
                                         <DoubleAnimation Duration="0:0:0.15"
                     Storyboard.TargetProperty="ScaleX" Storyboard.TargetName="Scale" To="1" />
                                         <DoubleAnimation Duration="0:0:0.15"