CodeMirror/SystemTrayMenu
1
0
Fork 0
mirror of https://github.com/Hofknecht/SystemTrayMenu.git synced 2024-06-27 18:40:32 +12:00
Code Issues Projects Releases Wiki Activity

[Feature] Swipe scrolling on touchscreen (#275), version 1.2.0.7

Browse source
This commit is contained in:
Markus Hofknecht 2021-12-30 11:56:34 +01:00
parent 3ce1407477
commit 543ff7bc29
3 changed files with 71 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Business/KeyboardInput.cs
View file

@ -297,8 +297,7 @@ namespace SystemTrayMenu.Handler
switch (keys) switch (keys)
{ {
case Keys.Enter: case Keys.Enter:
if (iRowKey > -1 && if (iRowKey > -1 && dgv.Rows.Count > iRowKey)
dgv.Rows.Count > iRowKey)
{ {
RowData trigger = (RowData)dgv.Rows[iRowKey].Cells[2].Value; RowData trigger = (RowData)dgv.Rows[iRowKey].Cells[2].Value;
if (trigger.IsMenuOpen || !trigger.ContainsMenu) if (trigger.IsMenuOpen || !trigger.ContainsMenu)
@ -312,15 +311,11 @@ namespace SystemTrayMenu.Handler
ClosePressed?.Invoke(); ClosePressed?.Invoke();
} }
try if (iRowKey > -1 && dgv.Rows.Count > iRowKey)
{ {
// Raise Dgv_RowPostPaint to show ProcessStarted // Raise Dgv_RowPostPaint to show ProcessStarted
dgv.InvalidateRow(iRowKey); dgv.InvalidateRow(iRowKey);
} }
catch (ArgumentOutOfRangeException ex)
{
Log.Warn("InvalidateRow failed", ex);
}
} }
else else
{ {

69
Business/Menus.cs
View file

@ -42,6 +42,9 @@ namespace SystemTrayMenu.Business
private bool waitingForReactivate; private bool waitingForReactivate;
private int rowIndexLastMouseDown = -1; private int rowIndexLastMouseDown = -1;
private bool showMenuAfterMainPreload; private bool showMenuAfterMainPreload;
private bool isDragging;
private bool isDraggingAndScrolled;
private int startDragRowHandle = -1;
public Menus() public Menus()
{ {
@ -627,7 +630,9 @@ namespace SystemTrayMenu.Business
dgv.CellMouseEnter -= dgvMouseRow.CellMouseEnter; dgv.CellMouseEnter -= dgvMouseRow.CellMouseEnter;
dgv.CellMouseLeave -= dgvMouseRow.CellMouseLeave; dgv.CellMouseLeave -= dgvMouseRow.CellMouseLeave;
dgv.MouseLeave -= dgvMouseRow.MouseLeave; dgv.MouseLeave -= dgvMouseRow.MouseLeave;
dgv.MouseLeave -= Dgv_MouseLeave;
dgv.MouseMove -= waitToOpenMenu.MouseMove; dgv.MouseMove -= waitToOpenMenu.MouseMove;
dgv.MouseMove -= Dgv_MouseMove;
dgv.MouseDown -= Dgv_MouseDown; dgv.MouseDown -= Dgv_MouseDown;
dgv.MouseUp -= Dgv_MouseUp; dgv.MouseUp -= Dgv_MouseUp;
dgv.MouseClick -= Dgv_MouseClick; dgv.MouseClick -= Dgv_MouseClick;
@ -938,7 +943,9 @@ namespace SystemTrayMenu.Business
dgv.CellMouseEnter += dgvMouseRow.CellMouseEnter; dgv.CellMouseEnter += dgvMouseRow.CellMouseEnter;
dgv.CellMouseLeave += dgvMouseRow.CellMouseLeave; dgv.CellMouseLeave += dgvMouseRow.CellMouseLeave;
dgv.MouseLeave += dgvMouseRow.MouseLeave; dgv.MouseLeave += dgvMouseRow.MouseLeave;
dgv.MouseLeave += Dgv_MouseLeave;
dgv.MouseMove += waitToOpenMenu.MouseMove; dgv.MouseMove += waitToOpenMenu.MouseMove;
dgv.MouseMove += Dgv_MouseMove;
dgv.MouseDown += Dgv_MouseDown; dgv.MouseDown += Dgv_MouseDown;
dgv.MouseUp += Dgv_MouseUp; dgv.MouseUp += Dgv_MouseUp;
dgv.MouseClick += Dgv_MouseClick; dgv.MouseClick += Dgv_MouseClick;
@ -987,6 +994,41 @@ namespace SystemTrayMenu.Business
} }
} }
private void Dgv_MouseMove(object sender, MouseEventArgs e)
{
if (isDragging)
{
DataGridView dgv = (DataGridView)sender;
int newRow = GetRowUnderCursor(dgv, e.Location);
if (newRow > -1)
{
int delta = startDragRowHandle - newRow;
DoScroll(dgv, delta * 2);
startDragRowHandle += delta;
}
}
}
private void DoScroll(DataGridView dgv, int delta)
{
if (delta != 0)
{
if (delta < 0 && dgv.FirstDisplayedScrollingRowIndex == 0)
{
delta = 0;
}
int newFirstDisplayedScrollingRowIndex = dgv.FirstDisplayedScrollingRowIndex + delta;
if (newFirstDisplayedScrollingRowIndex > -1 && newFirstDisplayedScrollingRowIndex < dgv.RowCount)
{
isDraggingAndScrolled = true;
dgv.FirstDisplayedScrollingRowIndex = newFirstDisplayedScrollingRowIndex;
Menu menu = (Menu)dgv.FindForm();
menu.AdjustScrollbar();
}
}
}
private void Dgv_MouseDown(object sender, MouseEventArgs e) private void Dgv_MouseDown(object sender, MouseEventArgs e)
{ {
DataGridView dgv = (DataGridView)sender; DataGridView dgv = (DataGridView)sender;
@ -1003,18 +1045,40 @@ namespace SystemTrayMenu.Business
{ {
rowIndexLastMouseDown = hitTestInfo.RowIndex; rowIndexLastMouseDown = hitTestInfo.RowIndex;
} }
isDragging = true;
startDragRowHandle = GetRowUnderCursor(dgv, e.Location);
}
private int GetRowUnderCursor(DataGridView dgv, Point location)
{
DataGridView.HitTestInfo myHitTest = dgv.HitTest(location.X, location.Y);
return myHitTest.RowIndex;
} }
private void Dgv_MouseUp(object sender, MouseEventArgs e) private void Dgv_MouseUp(object sender, MouseEventArgs e)
{ {
rowIndexLastMouseDown = -1; rowIndexLastMouseDown = -1;
isDragging = false;
isDraggingAndScrolled = false;
// In case during mouse down move mouse out of dgv (it has own scrollbehavior) which we need to refresh
Menu menu = (Menu)((DataGridView)sender).FindForm();
menu.AdjustScrollbar();
}
private void Dgv_MouseLeave(object sender, EventArgs e)
{
isDragging = false;
isDraggingAndScrolled = false;
} }
private void Dgv_RowMouseLeave(object sender, DataGridViewCellEventArgs e) private void Dgv_RowMouseLeave(object sender, DataGridViewCellEventArgs e)
{ {
DataGridView dgv = (DataGridView)sender; DataGridView dgv = (DataGridView)sender;
if (e.RowIndex == rowIndexLastMouseDown && if (!isDraggingAndScrolled &&
e.RowIndex == rowIndexLastMouseDown &&
e.RowIndex > -1 && e.RowIndex > -1 &&
e.RowIndex < dgv.Rows.Count) e.RowIndex < dgv.Rows.Count)
{ {
@ -1034,7 +1098,8 @@ namespace SystemTrayMenu.Business
DataGridView dgv = (DataGridView)sender; DataGridView dgv = (DataGridView)sender;
DataGridView.HitTestInfo hitTestInfo; DataGridView.HitTestInfo hitTestInfo;
hitTestInfo = dgv.HitTest(e.X, e.Y); hitTestInfo = dgv.HitTest(e.X, e.Y);
if (hitTestInfo.RowIndex == rowIndexLastMouseDown && if (!isDragging &&
hitTestInfo.RowIndex == rowIndexLastMouseDown &&
hitTestInfo.RowIndex > -1 && hitTestInfo.RowIndex > -1 &&
hitTestInfo.RowIndex < dgv.Rows.Count) hitTestInfo.RowIndex < dgv.Rows.Count)
{ {

4
Properties/AssemblyInfo.cs
View file

@ -39,5 +39,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.2.0.6")] [assembly: AssemblyVersion("1.2.0.7")]
[assembly: AssemblyFileVersion("1.2.0.6")] [assembly: AssemblyFileVersion("1.2.0.7")]