From a9f3308b270812e3d35c54e02a792d64d7984af9 Mon Sep 17 00:00:00 2001 From: Markus Hofknecht Date: Sun, 20 Feb 2022 21:35:38 +0100 Subject: [PATCH] [BUG] drag, scroll and search at same time (#335), version 1.2.8.8 --- Business/Menus.cs | 10 ++++++++++ Properties/AssemblyInfo.cs | 4 ++-- UserInterface/Menu.Designer.cs | 1 + UserInterface/Menu.cs | 7 +++++++ 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/Business/Menus.cs b/Business/Menus.cs index 75d7e0b..f3431b7 100644 --- a/Business/Menus.cs +++ b/Business/Menus.cs @@ -633,6 +633,7 @@ namespace SystemTrayMenu.Business menuToDispose.KeyPress -= keyboardInput.KeyPress; menuToDispose.CmdKeyProcessed -= keyboardInput.CmdKeyProcessed; menuToDispose.SearchTextChanging -= keyboardInput.SearchTextChanging; + menuToDispose.KeyPressCheck -= Menu_KeyPressCheck; menuToDispose.SearchTextChanged -= Menu_SearchTextChanged; DataGridView dgv = menuToDispose.GetDataGridView(); if (dgv != null) @@ -897,6 +898,7 @@ namespace SystemTrayMenu.Business menu.MouseEnter += waitLeave.Stop; menu.KeyPress += keyboardInput.KeyPress; menu.CmdKeyProcessed += keyboardInput.CmdKeyProcessed; + menu.KeyPressCheck += Menu_KeyPressCheck; menu.SearchTextChanging += Menu_SearchTextChanging; menu.SearchTextChanged += Menu_SearchTextChanged; menu.UserDragsMenu += Menu_UserDragsMenu; @@ -1485,6 +1487,14 @@ namespace SystemTrayMenu.Business } } + private void Menu_KeyPressCheck(object sender, KeyPressEventArgs e) + { + if (isDraggingSwipeScrolling) + { + e.Handled = true; + } + } + private void Menu_SearchTextChanging() { searchTextChanging = true; diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index a72a54c..07c39a7 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -39,5 +39,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.2.8.7")] -[assembly: AssemblyFileVersion("1.2.8.7")] +[assembly: AssemblyVersion("1.2.8.8")] +[assembly: AssemblyFileVersion("1.2.8.8")] diff --git a/UserInterface/Menu.Designer.cs b/UserInterface/Menu.Designer.cs index 92ca678..a81fae0 100644 --- a/UserInterface/Menu.Designer.cs +++ b/UserInterface/Menu.Designer.cs @@ -144,6 +144,7 @@ this.textBoxSearch.Size = new System.Drawing.Size(100, 15); this.textBoxSearch.TabIndex = 0; this.textBoxSearch.TextChanged += new System.EventHandler(this.TextBoxSearch_TextChanged); + this.textBoxSearch.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.TextBoxSearch_KeyPress); // // pictureBoxSearch // diff --git a/UserInterface/Menu.cs b/UserInterface/Menu.cs index 9144061..e7fb963 100644 --- a/UserInterface/Menu.cs +++ b/UserInterface/Menu.cs @@ -182,6 +182,8 @@ namespace SystemTrayMenu.UserInterface internal event EventHandler CmdKeyProcessed; + internal event EventHandler KeyPressCheck; + internal event EventHandlerEmpty SearchTextChanging; internal event EventHandler SearchTextChanged; @@ -747,6 +749,11 @@ namespace SystemTrayMenu.UserInterface MouseWheel?.Invoke(); } + private void TextBoxSearch_KeyPress(object sender, KeyPressEventArgs e) + { + KeyPressCheck?.Invoke(sender, e); + } + private void TextBoxSearch_TextChanged(object sender, EventArgs e) { customScrollbar.Value = 0;