Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle successive key presses better in wxGenericTreeCtrl search code.

Browse Source 
Go to the next item starting with the given character if the same one is
pressed multiple times. This is more useful than searching for an item
starting with multiple occurrences of this character (which usually won't
exist) and is more consistent with how Windows handles this.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72636 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-10-07 22:41:15 +00:00
parent a4e4e66dd6
commit 4d1cf9f3d3
1 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/generic/treectlg.cpp
View File

@@ -3310,17 +3310,23 @@ void wxGenericTreeCtrl::OnChar( wxKeyEvent &event )
{
// find the next item starting with the given prefix
wxChar ch = (wxChar)keyCode;
wxTreeItemId id;
wxTreeItemId id = FindItem(m_current, m_findPrefix + ch);
if ( !id.IsOk() )
// if the same character is typed multiple times then go to the
// next entry starting with that character instead of searching
// for an item starting with multiple copies of this character,
// this is more useful and is how it works under Windows.
if ( m_findPrefix.length() == 1 && m_findPrefix[0] == ch )
{
// no such item
break;
id = FindItem(m_current, ch);
}
else
{
const wxString newPrefix(m_findPrefix + ch);
id = FindItem(m_current, newPrefix);
if ( id.IsOk() )
m_findPrefix = newPrefix;
}
SelectItem(id);
m_findPrefix += ch;
// also start the timer to reset the current prefix if the user
// doesn't press any more alnum keys soon -- we wouldn't want
@@ -3330,7 +3336,14 @@ void wxGenericTreeCtrl::OnChar( wxKeyEvent &event )
m_findTimer = new wxTreeFindTimer(this);
}
// Notice that we should start the timer even if we didn't find
// anything to make sure we reset the search state later.
m_findTimer->Start(wxTreeFindTimer::DELAY, wxTIMER_ONE_SHOT);
if ( id.IsOk() )
{
SelectItem(id);
}
}
else
{