rewrite the position remembering

cqjjjzr · Dec 24, 2021 · 6d8edd1 · 6d8edd1
1 parent c5e4f8d
commit 6d8edd1
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 27 deletions.
diff --git a/DesktopLyrics.cs b/DesktopLyrics.cs
@@ -69,7 +69,6 @@ public bool Configure(IntPtr panelHandle)
             {
                 var settingsForm = new FrmSettings(_settings);
                 settingsForm.ShowDialog();
-                _settings = settingsForm.Settings; 
                 SaveSettings(_settings);
                 _frmLyrics?.UpdateFromSettings(_settings);
                 LyricParser.PreserveSlash = _settings.PreserveSlash;
@@ -93,11 +92,13 @@ public void SaveSettings()
         public void Close(PluginCloseReason reason)
         {
             _timer.Stop();
-            Control.FromHandle(_mbApiInterface.MB_GetWindowHandle()).Invoke(new Action(() =>
+            var ctrl = Control.FromHandle(_mbApiInterface.MB_GetWindowHandle());
+            _frmLyrics?.Invoke(new Action(() =>
             {
                 _frmLyrics?.Dispose();
                 _frmLyrics = null;
             }));
+            SaveSettings(_settings);
         }
 
         public void Uninstall()
@@ -113,7 +114,7 @@ public void ReceiveNotification(string sourceFileUrl, NotificationType type)
             switch (type)
             {
                 case NotificationType.PluginStartup:
-                    // while (!Debugger.IsAttached) Thread.Sleep(1);
+                    while (!Debugger.IsAttached) System.Threading.Thread.Sleep(1);
                     try
                     {
                         try
@@ -195,7 +196,7 @@ private void StartupForm()
             var f = (Form)Control.FromHandle(_mbApiInterface.MB_GetWindowHandle());
             f.Invoke(new Action(() =>
             {
-                _frmLyrics = new FrmLyrics(_settings, SettingsPath2);
+                _frmLyrics = new FrmLyrics(_settings);
                 _frmLyrics.Show();
             }));
         }

diff --git a/FrmLyrics.Designer.cs b/FrmLyrics.Designer.cs
diff --git a/FrmLyrics.cs b/FrmLyrics.cs
@@ -7,12 +7,10 @@ namespace MusicBeePlugin
 {
     public partial class FrmLyrics : Form
     {
-        private readonly SettingsObj _startupSettings;
-        private readonly string _path;
-        public FrmLyrics(SettingsObj settings, string path)
+        private SettingsObj _settings;
+        public FrmLyrics(SettingsObj settings)
         {
-            _path = path;
-            _startupSettings = settings;
+            _settings = settings;
 
             InitializeComponent();
         }
@@ -22,26 +20,32 @@ private void FrmLyrics_Load(object sender, EventArgs e)
             var scrBounds = Screen.PrimaryScreen.Bounds;
             Width = scrBounds.Width;
             Height = 150;
-            try
-            {
-                var coord = File.ReadAllText(_path).Split(' ');
-                Left = int.Parse(coord[0]);
-                Top = int.Parse(coord[1]);
-            }
-            catch (Exception)
+            if (_settings.PosY < 0)
             {
                 Top = scrBounds.Height - Height - 150;
                 Left = 0;
             }
+            else
+            {
+                Top = _settings.PosY;
+                Left = _settings.PosX;
+            }
 
             TopMost = true;
 
             UnmanagedHelper.SetTopMost(this);
-            UpdateFromSettings(_startupSettings);
+            UpdateFromSettings(_settings);
+
+            Move += (o, args) =>
+            {
+                _settings.PosX = Left;
+                _settings.PosY = Top;
+            };
         }
 
         public void UpdateFromSettings(SettingsObj settings)
         {
+            _settings = settings;
             LyricsRenderer.UpdateFromSettings(settings, Width);
 
             Redraw();
@@ -109,20 +113,13 @@ private void FrmLyrics_MouseDown(object sender, MouseEventArgs e)
             }
         }
 
-        private void FrmLyrics_Move(object sender, EventArgs e)
-        {
-            File.WriteAllText(_path, $@"{Left} {Top}");
-        }
-
         private void FrmLyrics_MouseUp(object sender, MouseEventArgs e)
         {
             // This event is never fired...?
             //if (e.Button != MouseButtons.Left) return;
             //global::Unmanaged.Unmanaged.SendMessage(Handle, 0x00A2, new IntPtr(0x0002), null);
         }
 
-
-
         protected override CreateParams CreateParams
         {
             get

diff --git a/FrmSettings.cs b/FrmSettings.cs
@@ -95,7 +95,9 @@ public class SettingsObj
         public bool PreserveSlash = false;
         public bool AutoHide = false;
         public bool HideOnStartup = false;
-
+        public int PosY = -1;
+        public int PosX = -1;
+
         [JsonIgnore]
         public Font FontActual
         {

diff --git a/TestMain.cs b/TestMain.cs
@@ -17,7 +17,7 @@ public static void Main2(string[] args)
                 Color2 = Color.LightGray,
                 FontActual = new Font(new FontFamily("Microsoft Yahei"), 34.0f, FontStyle.Regular, GraphicsUnit.Point),
                 GradientType = 1
-            }, "x.set"));
+            }));
         }
     }
 }