CodeMirror/SystemTrayMenu
1
0
Fork 0
mirror of https://github.com/Hofknecht/SystemTrayMenu.git synced 2024-10-02 01:57:23 +13:00
Code Issues Projects Releases Wiki Activity

Improve window relocation by mouse dragging

Browse source
This commit is contained in:
Peter Kirmeier 2023-05-16 19:57:02 +02:00
parent d75d183918
commit 1e5c8c8f94
1 changed files with 26 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
UserInterface/Menu.xaml.cs
View file

@ -45,7 +45,6 @@ namespace SystemTrayMenu.UserInterface
public const string RowFilterShowAll = "[SortIndex] LIKE '%0%'"; public const string RowFilterShowAll = "[SortIndex] LIKE '%0%'";
#endif #endif
private bool directionToRight; private bool directionToRight;
private bool mouseDown;
private Point lastLocation; private Point lastLocation;
#if TODO // SEARCH #if TODO // SEARCH
@ -95,6 +94,9 @@ namespace SystemTrayMenu.UserInterface
// Use Main Menu DPI for all further calculations // Use Main Menu DPI for all further calculations
Scaling.CalculateFactorByDpi(this); Scaling.CalculateFactorByDpi(this);
// Moving the window is only supported for the main menu
MouseDown += MainMenu_MoveStart;
} }
else else
{ {
@ -152,10 +154,6 @@ namespace SystemTrayMenu.UserInterface
labelStatus.FontSize = Scaling.ScaleFontByPoints(7F); labelStatus.FontSize = Scaling.ScaleFontByPoints(7F);
dgv.FontSize = Scaling.ScaleFontByPoints(9F); dgv.FontSize = Scaling.ScaleFontByPoints(9F);
MouseDown += Menu_MouseDown;
MouseUp += Menu_MouseUp;
MouseMove += Menu_MouseMove;
textBoxSearch.TextChanged += (_, _) => TextBoxSearch_TextChanged(false); textBoxSearch.TextChanged += (_, _) => TextBoxSearch_TextChanged(false);
textBoxSearch.ContextMenu = new() textBoxSearch.ContextMenu = new()
{ {
@ -1159,35 +1157,40 @@ namespace SystemTrayMenu.UserInterface
} }
} }
private void Menu_MouseDown(object sender, MouseButtonEventArgs e) private void MainMenu_MoveStart(object sender, MouseButtonEventArgs e)
{ {
if (Level == 0) // Hide all sub menus to clear the view for repositioning of the main menu
if (SubMenu != null)
{ {
mouseDown = true; SubMenu?.HideWithFade(true);
lastLocation = NativeMethods.Screen.CursorPosition; RefreshSelection();
UserDragsMenu?.Invoke(this);
Mouse.Capture(this);
} }
lastLocation = NativeMethods.Screen.CursorPosition;
MouseMove += MainMenu_MoveRelocate;
MouseUp += MainMenu_MoveEnd;
Deactivated += MainMenu_MoveEnd;
Mouse.Capture(this);
} }
private void Menu_MouseMove(object sender, MouseEventArgs e) private void MainMenu_MoveRelocate(object sender, MouseEventArgs e)
{ {
if (mouseDown) Point mousePos = NativeMethods.Screen.CursorPosition;
{ Left = Left + mousePos.X - lastLocation.X;
Point mousePos = NativeMethods.Screen.CursorPosition; Top = Top + mousePos.Y - lastLocation.Y;
Left = Left + mousePos.X - lastLocation.X; lastLocation = mousePos;
Top = Top + mousePos.Y - lastLocation.Y;
lastLocation = mousePos;
Settings.Default.CustomLocationX = (int)Left; Settings.Default.CustomLocationX = (int)Left;
Settings.Default.CustomLocationY = (int)Top; Settings.Default.CustomLocationY = (int)Top;
}
} }
private void Menu_MouseUp(object sender, MouseButtonEventArgs e) private void MainMenu_MoveEnd(object? sender, EventArgs? e)
{ {
mouseDown = false;
Mouse.Capture(null); Mouse.Capture(null);
MouseMove -= MainMenu_MoveRelocate;
MouseUp -= MainMenu_MoveEnd;
Deactivated -= MainMenu_MoveEnd;
if (Settings.Default.UseCustomLocation) if (Settings.Default.UseCustomLocation)
{ {
if (!SettingsWindow.IsOpen()) if (!SettingsWindow.IsOpen())