CodeMirror/SystemTrayMenu
1
0
Fork 0
mirror of https://github.com/Hofknecht/SystemTrayMenu.git synced 2024-05-16 02:13:39 +12:00
Code Issues Projects Releases Wiki Activity

Context menu will horizontally follow mouse

Browse source 
Add compile switch to use Windows Explorer behavior instead
- Mouse: Directly at mouse position
- Keyboard: Left aligned with padding, vertically centered
This commit is contained in:
Peter Kirmeier 2023-09-01 19:49:34 +02:00
parent fa8ebdceb0
commit cd26d6eda8
3 changed files with 42 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Business/KeyboardInput.cs
View file

@ -124,7 +124,7 @@ namespace SystemTrayMenu.Business
case Key.Apps:
if (modifiers == ModifierKeys.None)
{
focussedMenu?.SelectedItem?.OpenShellContextMenu();
focussedMenu?.SelectedItem?.OpenShellContextMenu(null);
}
break;

25
DataClasses/RowData.cs
View file

@ -269,15 +269,30 @@ namespace SystemTrayMenu.DataClasses
}
}
internal void OpenShellContextMenu()
internal void OpenShellContextMenu(Point? mousePosition)
{
Point position = default;
if (Owner != null)
if (mousePosition != null)
{
Point positionChild = Owner.GetRelativeDataGridViewChildPosition(this);
Point positionDgv = Owner.GetRelativeChildPositionTo(Owner.GetDataGridView());
position = new Point(Owner.Left + positionDgv.X + positionChild.X, Owner.Top + positionDgv.Y + positionChild.Y);
position = mousePosition.Value;
}
else
{
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
}
}
if (IsPointingToFolder)

30
UserInterface/Menu.xaml.cs
View file

@ -7,7 +7,6 @@ namespace SystemTrayMenu.UserInterface
using System;
using System.Collections.Generic;
using System.Collections.Specialized;
using System.Globalization;
using System.IO;
using System.Windows;
using System.Windows.Controls;
@ -732,7 +731,7 @@ namespace SystemTrayMenu.UserInterface
RowData? trigger = RowDataParent;
if (trigger != null)
{
double offset = menuPredecessor.GetRelativeDataGridViewChildPosition(trigger).Y;
double offset = menuPredecessor.GetDataGridViewChildRect(trigger).Top;
if (offset < 0)
{
@ -794,12 +793,12 @@ namespace SystemTrayMenu.UserInterface
}
}
internal Point GetRelativeDataGridViewChildPosition(RowData rowData)
internal Rect GetDataGridViewChildRect(RowData rowData)
{
// When scrolled, we have to reduce the index number as we calculate based on visual tree
int rowIndex = rowData.RowIndex;
int startIndex = 0;
double offset = 0D;
double offsetY = 0D;
if (VisualTreeHelper.GetChild(dgv, 0) is Decorator { Child: ScrollViewer scrollViewer })
{
startIndex = (int)scrollViewer.VerticalOffset;
@ -811,7 +810,7 @@ namespace SystemTrayMenu.UserInterface
ListViewItem? item = dgv.FindVisualChildOfType<ListViewItem>(i);
if (item != null)
{
offset -= item.ActualHeight;
offsetY -= item.ActualHeight;
}
}
}
@ -832,12 +831,13 @@ namespace SystemTrayMenu.UserInterface
break;
}
offset += item.ActualHeight;
offsetY += item.ActualHeight;
}
}
}
return new(0D, offset);
// All childs are using same width and height, so we simply fill in values from parent instead of individual child
return new(0D, offsetY, dgv.ActualWidth, (double)Resources["RowHeight"]);
}
private static bool Filter_Default(RowData itemData)
@ -1144,7 +1144,8 @@ namespace SystemTrayMenu.UserInterface
private void ListViewItem_PreviewMouseDown(object sender, MouseButtonEventArgs e)
{
RowData itemData = (RowData)((ListViewItem)sender).Content;
ListViewItem lvi = (ListViewItem)sender;
RowData itemData = (RowData)lvi.Content;
CellMouseDown?.Invoke(itemData);
@ -1155,7 +1156,18 @@ namespace SystemTrayMenu.UserInterface
// Prevent any use of MouseEnter/MouseLeave while the menu is open.
// TODO: Find root case and fix this properly.
isShellContextMenuOpen = true;
itemData.OpenShellContextMenu();
#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
itemData.OpenShellContextMenu(position);
isShellContextMenuOpen = false;
}
}