Switch context menu location as it is done by Windows Explorer

Hofknecht · Sep 11, 2023 · bfd50ae · bfd50ae
1 parent 4f1ee53
commit bfd50ae
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 17 deletions.
diff --git a/DataClasses/RowData.cs b/DataClasses/RowData.cs
@@ -281,17 +281,10 @@ internal void OpenShellContextMenu(Point? mousePosition)
             {
                 if (Owner != null)
                 {
-#if CONTEXT_MENU_EXPLORER_BEHAVIOR
                     // Snap context menu left aligned to the ListViewItem with a small padding, but keep it vertically centered
                     Rect rectChild = Owner.GetDataGridViewChildRect(this);
                     position = Owner.GetRelativeChildPositionTo(Owner.GetDataGridView());
                     position.Offset(Owner.Left + rectChild.Left + 10D, Owner.Top + rectChild.Top + (rectChild.Height / 2D));
-#else
-                    // Snap context menu left and top aligned to the ListViewItem
-                    Rect rectChild = Owner.GetDataGridViewChildRect(this);
-                    position = Owner.GetRelativeChildPositionTo(Owner.GetDataGridView());
-                    position.Offset(Owner.Left + rectChild.Left, Owner.Top + rectChild.Top);
-#endif
                 }
             }
 

diff --git a/UserInterface/Menu.xaml.cs b/UserInterface/Menu.xaml.cs
@@ -1174,21 +1174,12 @@ private void ListViewItem_MouseLeave(object sender, MouseEventArgs e)
 
         private void ListViewItem_MouseRightButtonUp(object sender, MouseButtonEventArgs e)
         {
-            ListViewItem lvi = (ListViewItem)sender;
-            RowData itemData = (RowData)lvi.Content;
-
-#if CONTEXT_MENU_EXPLORER_BEHAVIOR
             // At mouse location
             Point position = Mouse.GetPosition(this);
             position.Offset(Left, Top);
-#else
-            // Snap context menu above the ListViewItem, but horizontally follow the mouse
-            Point position = this.GetRelativeChildPositionTo(lvi);
-            position.Offset(Left + Mouse.GetPosition(lvi).X, Top);
-#endif
 
             isShellContextMenuOpen = true;
-            itemData.OpenShellContextMenu(position);
+            ((RowData)((ListViewItem)sender).Content).OpenShellContextMenu(position);
             isShellContextMenuOpen = false;
         }
     }