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

[BUG] drag, scroll and search at same time (#335), version 1.2.8.8

Browse source
This commit is contained in:
Markus Hofknecht 2022-02-20 21:35:38 +01:00
parent aef79c431a
commit a9f3308b27
4 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Business/Menus.cs
View file

@ -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;

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
// 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")]

1
UserInterface/Menu.Designer.cs generated
View file

@ -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
//

7
UserInterface/Menu.cs
View file

@ -182,6 +182,8 @@ namespace SystemTrayMenu.UserInterface
internal event EventHandler<Keys> CmdKeyProcessed;
internal event EventHandler<KeyPressEventArgs> 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;