Improve Windows 10 opening animation

srwi · Jan 26, 2023 · 446c961 · 446c961
1 parent 0c8899a
commit 446c961
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/EverythingToolbar/SearchWindow.xaml b/EverythingToolbar/SearchWindow.xaml
@@ -41,6 +41,7 @@
         </Border.Effect>
         <Border x:Name="PopupBorder"
                 BorderThickness="1"
+                BorderBrush="{DynamicResource SearchResultsViewBorder}"
                 Background="{DynamicResource SearchResultsViewHeader}">
 
             <Grid Name="ContentGrid">

diff --git a/EverythingToolbar/SearchWindow.xaml.cs b/EverythingToolbar/SearchWindow.xaml.cs
@@ -140,24 +140,28 @@ private void AnimateShowWin10(double left, double top, double width, double heig
             Thickness contentGridOffset;
             if (taskbarEdge == Edge.Top)
             {
+                Top -= DropShadowBlurRadius;
                 Left -= DropShadowBlurRadius;
                 contentGridOffset = new Thickness(0, -50, 0, 50);
                 PopupMarginBorder.Margin = new Thickness(DropShadowBlurRadius, 0, DropShadowBlurRadius, DropShadowBlurRadius);
             }
             else if (taskbarEdge == Edge.Right)
             {
                 Top -= DropShadowBlurRadius;
+                Left += DropShadowBlurRadius;
                 contentGridOffset = new Thickness(50, 0, -50, 0);
                 PopupMarginBorder.Margin = new Thickness(DropShadowBlurRadius, DropShadowBlurRadius, 0, DropShadowBlurRadius);
             }
             else if (taskbarEdge == Edge.Left)
             {
                 Top -= DropShadowBlurRadius;
+                Left -= DropShadowBlurRadius;
                 contentGridOffset = new Thickness(-50, 0, 50, 0);
                 PopupMarginBorder.Margin = new Thickness(0, DropShadowBlurRadius, DropShadowBlurRadius, DropShadowBlurRadius);
             }
             else
             {
+                Top += DropShadowBlurRadius;
                 Left -= DropShadowBlurRadius;
                 contentGridOffset = new Thickness(0, 50, 0, -50);
                 PopupMarginBorder.Margin = new Thickness(DropShadowBlurRadius, DropShadowBlurRadius, DropShadowBlurRadius, 0);
@@ -236,8 +240,8 @@ private void AnimateHideWin10(Edge taskbarEdge)
                     break;
             }
             DoubleAnimation animation = new DoubleAnimation(target, TimeSpan.Zero);
+            animation.Completed += OnHidden;
             BeginAnimation(property, animation);
-            base.Hide();
         }
 
         private void AnimateHideWin11(Edge taskbarEdge)

diff --git a/EverythingToolbar/Themes/Win11/DARK.xaml b/EverythingToolbar/Themes/Win11/DARK.xaml
@@ -33,7 +33,7 @@
     <SolidColorBrush x:Key="QuickSettingsToggleButtonBorderActive" Color="Transparent" />
 
     <SolidColorBrush x:Key="SearchResultsViewBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="SearchResultsViewBorder" Color="#7f5f5f5f" />
+    <SolidColorBrush x:Key="SearchResultsViewBorder" Color="Transparent" />
     <SolidColorBrush x:Key="SearchResultsViewHeader" Color="#b9151515" />
 
     <SolidColorBrush x:Key="TabBackground" Color="#11ffffff" />

diff --git a/EverythingToolbar/Themes/Win11/LIGHT.xaml b/EverythingToolbar/Themes/Win11/LIGHT.xaml
@@ -33,7 +33,7 @@
     <SolidColorBrush x:Key="QuickSettingsToggleButtonBorderActive" Color="Transparent" />
 
     <SolidColorBrush x:Key="SearchResultsViewBackground" Color="Transparent" />
-    <SolidColorBrush x:Key="SearchResultsViewBorder" Color="#7f5f5f5f" />
+    <SolidColorBrush x:Key="SearchResultsViewBorder" Color="Transparent" />
     <SolidColorBrush x:Key="SearchResultsViewHeader" Color="#ddffffff" />
 
     <SolidColorBrush x:Key="TabBackground" Color="#ccfbfbfb" />