fix(QuickMenu): Take into account the edge of the screen and show the…

… quick menu properly Fixes #735
Belphemur · Oct 30, 2021 · bc9eccb · bc9eccb
1 parent 128981a
commit bc9eccb
Showing 1 changed file with 21 additions and 5 deletions.
diff --git a/SoundSwitch.UI.Menu/Form/QuickMenu.cs b/SoundSwitch.UI.Menu/Form/QuickMenu.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.Drawing;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Windows.Forms;
@@ -48,8 +49,6 @@ internal QuickMenu()
         {
             InitializeComponent();
             _hideDisposeMethod = HideDispose;
-            Show();
-            SetLocationToCursor();
         }
 
         /// <summary>
@@ -113,6 +112,13 @@ public void SetData(IEnumerable<IconMenuItem<T>.DataContainer> payloads)
 
                 Height = 0;
             }
+
+            if (!isLocationSet)
+            {
+                Show();
+                SetLocationToCursor();
+                isLocationSet = true;
+            }
         }
 
         private void DebounceHiding()
@@ -139,6 +145,8 @@ private void OnItemClicked(IconMenuItem<T> control)
             SelectionChanged?.Invoke(control, new MenuClickedEvent(dataContainer));
         }
 
+        private bool isLocationSet = false;
+
         private async Task HideDispose()
         {
             _hiding = true;
@@ -153,6 +161,7 @@ private async Task HideDispose()
 
             Hide();
             Dispose();
+            isLocationSet = false;
         }
 
         private void ResetOpacity()
@@ -162,9 +171,16 @@ private void ResetOpacity()
 
         private void SetLocationToCursor()
         {
-            var position = Cursor.Position;
-            SetDesktopLocation(position.X, position.Y);
-            Location = position;
+            int screenWidth = Screen.PrimaryScreen.Bounds.Width;
+            int screenHeight = Screen.PrimaryScreen.Bounds.Height;
+            Point qmLoc = new Point(
+                Math.Min(Cursor.Position.X, screenWidth - Width),
+                Math.Min(Cursor.Position.Y, screenHeight - Height)
+            );
+
+            SetDesktopLocation(qmLoc.X, qmLoc.Y);
+            Location = qmLoc;
+            isLocationSet = true;
         }
     }
 }