CodeMirror/SystemTrayMenu
1
0
Fork 0
mirror of https://github.com/Hofknecht/SystemTrayMenu.git synced 2024-06-02 10:34:42 +12:00
Code Issues Projects Releases Wiki Activity

Improved search function (no functional change)

Browse source 
Resolved warnings (pragma), add some comments and restructured code for better readability
This commit is contained in:
Peter Kirmeier 2019-07-13 22:44:31 +02:00
parent 828fda03af
commit a1bb0a5604
2 changed files with 34 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Properties/AssemblyInfo.cs
View file

@ -31,5 +31,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("0.9.1.245")]
[assembly: AssemblyFileVersion("0.9.1.245")]
[assembly: AssemblyVersion("0.9.1.246")]
[assembly: AssemblyFileVersion("0.9.1.246")]

62
SystemTrayMenuHandler.cs
View file

@ -26,7 +26,7 @@ namespace SystemTrayMenu
Timer timerKeySearch = new Timer();
int iRowKey = -1;
int iMenuKey = 0;
string keyInput = string.Empty;
string KeySearchString = string.Empty;
MenuNotifyIcon menuNotifyIcon = null;
WaitFastLeave fastLeave = new WaitFastLeave();
@ -705,6 +705,11 @@ namespace SystemTrayMenu
return menu;
}
/// <summary>
/// While menu is open user presses a key to search for specific entries.
/// </summary>
/// <param name="sender">not used</param>
/// <param name="e">Key data of the pressed key</param>
private void KeyPress(object sender, KeyPressEventArgs e)
{
if (char.IsLetterOrDigit(e.KeyChar) ||
@ -714,23 +719,28 @@ namespace SystemTrayMenu
{
string letter = e.KeyChar.ToString();
if (string.IsNullOrEmpty(keyInput))
timerKeySearch.Stop();
if (string.IsNullOrEmpty(KeySearchString))
{
keyInput = letter;
Search(keyInput, true);
// no search string set, start new search
KeySearchString += letter;
SelectByKey(Keys.None, KeySearchString);
}
else if (keyInput.LastOrDefault().ToString() == letter)
else if (KeySearchString.LastOrDefault().ToString() == letter)
{
keyInput += letter;
Search(letter, true);
timerKeySearch.Stop();
// previous letter pressed again, jump to next element
KeySearchString += letter;
SelectByKey(Keys.None, letter);
}
else
{
keyInput += letter;
Search(keyInput, false);
timerKeySearch.Stop();
// new character for the search string, narrow down the search
KeySearchString += letter;
SelectByKey(Keys.None, KeySearchString, true);
}
// give user some time to continue with this search
timerKeySearch.Start();
e.Handled = true;
}
@ -738,15 +748,9 @@ namespace SystemTrayMenu
private void TimerKeySearch_Tick(object sender, EventArgs e)
{
// this search has expired, reset search
timerKeySearch.Stop();
//Search(keyInput);
keyInput = string.Empty;
}
#warning better word than force
private void Search(string keyInput, bool force)
{
SelectByKey(Keys.None, keyInput, force);
KeySearchString = string.Empty;
}
private void CmdKeyProcessed(Keys keys)
@ -791,8 +795,7 @@ namespace SystemTrayMenu
return isStillSelected;
}
private void SelectByKey(Keys keys, string keyInput = "",
bool force = true)
private void SelectByKey(Keys keys, string keyInput = "", bool KeepSelection = false)
{
int iRowBefore = iRowKey;
int iMenuBefore = iMenuKey;
@ -802,17 +805,17 @@ namespace SystemTrayMenu
DataGridView dgvBefore = null;
Menu menuFromSelected = null;
string textselected = string.Empty;
bool isStillSelected = IsAnyMenuSelectedByKey(
ref dgv, ref menuFromSelected, ref textselected);
bool isStillSelected = IsAnyMenuSelectedByKey(ref dgv, ref menuFromSelected, ref textselected);
if (isStillSelected)
{
dgvBefore = dgv;
if (!force &&
textselected.ToLower().StartsWith(keyInput.ToLower()))
if (KeepSelection)
{
#warning rewrite function should not return here
return; // is that ok? check twice
// Is current selection is still valid for this search then skip selecting different item
if (textselected.ToLower().StartsWith(keyInput.ToLower()))
return;
}
dgvBefore = dgv;
}
else
{
@ -965,8 +968,7 @@ namespace SystemTrayMenu
}
if (isStillSelected && toClear)
{
ClearIsSelectedByKey(iMenuBefore,
iRowBefore);
ClearIsSelectedByKey(iMenuBefore, iRowBefore);
}
}