From 4ac3d1eb3a58bb2ef1523febeda7f06badc96088 Mon Sep 17 00:00:00 2001
From: Peter Kirmeier <topeterk@users.noreply.github.com>
Date: Sun, 20 Aug 2023 14:03:58 +0200
Subject: [PATCH] Fix wrong appearance in menu size and position when switching
 from loading menu to final sub menu

---
 Business/Menus.cs          |  6 ++++++
 UserInterface/Menu.xaml    | 11 ++++++++---
 UserInterface/Menu.xaml.cs | 17 +++++++++++++++++
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/Business/Menus.cs b/Business/Menus.cs
index 139d49e..e3e0dce 100644
--- a/Business/Menus.cs
+++ b/Business/Menus.cs
@@ -355,8 +355,14 @@ namespace SystemTrayMenu.Business
             if (menuData.DirectoryState != MenuDataDirectoryState.Undefined)
             {
                 // Sub Menu (completed)
+                // As we need to render it during calculations but we don't want to show flickering windows,
+                // we just hide it for just a moment and show it again after updates have been applied.
+                // In order to hide it via Opacity we have to cancel any Fade animations.
+                menu.StopFade();
+                menu.Opacity = 0D;
                 menu.AddItemsToMenu(menuData.RowDatas, menuData.DirectoryState);
                 AdjustMenusSizeAndLocation(menu.Level);
+                menu.Opacity = 1D;
             }
             else
             {
diff --git a/UserInterface/Menu.xaml b/UserInterface/Menu.xaml
index 8865e71..ec8715f 100644
--- a/UserInterface/Menu.xaml
+++ b/UserInterface/Menu.xaml
@@ -18,7 +18,7 @@
 
     <Window.Triggers>
         <EventTrigger RoutedEvent="local:Menu.FadeToTransparent">
-            <BeginStoryboard>
+            <BeginStoryboard Name="FadeToTransparentStoryboard">
                 <Storyboard>
                     <DoubleAnimation
                         Storyboard.TargetProperty="Opacity"
@@ -27,7 +27,7 @@
             </BeginStoryboard>
         </EventTrigger>
         <EventTrigger RoutedEvent="local:Menu.FadeIn">
-            <BeginStoryboard>
+            <BeginStoryboard Name="FadeInStoryboard">
                 <Storyboard>
                     <DoubleAnimation
                         Storyboard.TargetProperty="Opacity"
@@ -36,7 +36,7 @@
             </BeginStoryboard>
         </EventTrigger>
         <EventTrigger RoutedEvent="local:Menu.FadeOut">
-            <BeginStoryboard>
+            <BeginStoryboard Name="FadeOutStoryboard">
                 <Storyboard>
                     <DoubleAnimation
                         Storyboard.TargetProperty="Opacity"
@@ -45,6 +45,11 @@
                 </Storyboard>
             </BeginStoryboard>
         </EventTrigger>
+        <EventTrigger RoutedEvent="local:Menu.FadeStop">
+            <StopStoryboard BeginStoryboardName="FadeToTransparentStoryboard" />
+            <StopStoryboard BeginStoryboardName="FadeInStoryboard" />
+            <StopStoryboard BeginStoryboardName="FadeOutStoryboard"/>
+        </EventTrigger>
     </Window.Triggers>
 
     <Window.Resources>
diff --git a/UserInterface/Menu.xaml.cs b/UserInterface/Menu.xaml.cs
index 5c7a23e..389cd04 100644
--- a/UserInterface/Menu.xaml.cs
+++ b/UserInterface/Menu.xaml.cs
@@ -37,6 +37,9 @@ namespace SystemTrayMenu.UserInterface
         private static readonly RoutedEvent FadeOutEvent = EventManager.RegisterRoutedEvent(
             nameof(FadeOut), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(Menu));
 
+        private static readonly RoutedEvent FadeStopEvent = EventManager.RegisterRoutedEvent(
+            nameof(FadeStop), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(Menu));
+
         private readonly string folderPath;
 
         private bool isShellContextMenuOpen;
@@ -243,6 +246,12 @@ namespace SystemTrayMenu.UserInterface
             remove { RemoveHandler(FadeOutEvent, value); }
         }
 
+        internal event RoutedEventHandler FadeStop
+        {
+            add { AddHandler(FadeStopEvent, value); }
+            remove { RemoveHandler(FadeStopEvent, value); }
+        }
+
         internal enum StartLocation
         {
             Point,
@@ -503,6 +512,14 @@ namespace SystemTrayMenu.UserInterface
             }
         }
 
+        internal void StopFade()
+        {
+            if (Settings.Default.UseFading)
+            {
+                RaiseEvent(new(routedEvent: FadeStopEvent));
+            }
+        }
+
         /// <summary>
         /// Update the position and size of the menu.
         /// </summary>