Hide window on closing - fix bugs #23, #24

avdynut · Oct 2, 2019 · d88e996 · d88e996
1 parent 0ab586c
commit d88e996
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 9 deletions.
diff --git a/AimpLyrics.Test/App.xaml.cs b/AimpLyrics.Test/App.xaml.cs
@@ -9,7 +9,7 @@ public partial class App : Application
     {
         private void OnStartup(object sender, StartupEventArgs e)
         {
-            var window = new LyricsWindow(new Player());
+            var window = new LyricsWindow(new Player(), new AimpMessageHook());
             window.Show();
         }
     }

diff --git a/AimpLyrics/AimpLyricsPlugin.cs b/AimpLyrics/AimpLyricsPlugin.cs
@@ -9,10 +9,18 @@ namespace AimpLyrics
     [AimpPlugin("AimpLyrics", "Andrey Arekhva", "1.0.3", AimpPluginType = AimpPluginType.Addons, Description = "Display lyrics for current playing song. Find lyrics in file, tag or Google")]
     public class AimpLyricsPlugin : AimpPlugin
     {
+        private LyricsWindow _lyricsWindow;
+        private AimpMessageHook _hook;
+
         public override void Initialize()
         {
             SetUpLogger();
             AddMenuItem();
+
+            _hook = new AimpMessageHook();
+            Player.ServiceMessageDispatcher.Hook(_hook);
+            _lyricsWindow = new LyricsWindow(Player, _hook);
+
             Trace.WriteLine($"Initialized AIMP Lyrics Plugin v{Assembly.GetExecutingAssembly().GetName().Version}");
         }
 
@@ -37,9 +45,8 @@ private void AddMenuItem()
 
             action.OnExecute += (sender, args) =>
             {
-                var lyricsWindow = new LyricsWindow(Player);
-                lyricsWindow.Show();
-                lyricsWindow.Activate();
+                _lyricsWindow.Show();
+                _lyricsWindow.Activate();
             };
 
             menuItem.Action = action;
@@ -49,6 +56,8 @@ private void AddMenuItem()
 
         public override void Dispose()
         {
+            _lyricsWindow?.Close();
+            Player.ServiceMessageDispatcher.Unhook(_hook);
             Trace.Close();
         }
     }

diff --git a/AimpLyrics/LyricsWIndow.xaml b/AimpLyrics/LyricsWIndow.xaml
@@ -3,7 +3,6 @@
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         Title="Lyrics"
         WindowStyle="ToolWindow"
-        Closing="OnClosing"
         SizeToContent="Width" MinWidth="250">
     <Grid>
         <Grid.RowDefinitions>

diff --git a/AimpLyrics/LyricsWIndow.xaml.cs b/AimpLyrics/LyricsWIndow.xaml.cs
@@ -28,13 +28,15 @@ public partial class LyricsWindow : Window
         private string _filePath;
         private LyricsSource _source;
 
-        public LyricsWindow(IAimpPlayer player)
+        private bool _hideOnClosing = true;
+
+        public LyricsWindow(IAimpPlayer player, AimpMessageHook hook)
         {
             InitializeComponent();
 
             _player = player;
+            _hook = hook;
 
-            _hook = new AimpMessageHook();
             _hook.FileInfoReceived += UpdateSongInfo;
             _hook.PlayerStopped += ResetFileInfo;
             _player.ServiceMessageDispatcher.Hook(_hook);
@@ -232,11 +234,26 @@ private void OnSearchButtonClick(object sender, RoutedEventArgs e)
             SearchLyricsInGoogleOnBackground();
         }
 
-        private void OnClosing(object sender, CancelEventArgs e)
+        protected override void OnClosing(CancelEventArgs e)
+        {
+            if (_hideOnClosing)
+            {
+                Hide();
+                e.Cancel = true;
+            }
+            else
+            {
+                base.OnClosing(e);
+            }
+        }
+
+        public new void Close()
         {
+            _hideOnClosing = false;
             _hook.FileInfoReceived -= UpdateSongInfo;
             _hook.PlayerStopped -= ResetFileInfo;
-            _player.ServiceMessageDispatcher.Unhook(_hook);
+
+            base.Close();
         }
     }
 }