github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-21 06:45:39 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Improved navigator ergonomics

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@563 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2008-10-22 18:57:11 +00:00
parent 4ac6e77c7e
commit e3f30f12b5
5 changed files with 70 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

22
uppsrc/ide/Browser/CodeBrowser.cpp
View file

@ -2,6 +2,7 @@
bool MatchCib(const String& s, const String& match)
{
if(IsNull(match)) return true;
int q = ToUpper(s).Find(match);
return q > 0 && !iscid(s[q - 1]) || q == 0;
}
@ -149,6 +150,7 @@ void CodeBrowser::LoadScope()
item.Sort(1, ItemCompare);
if(item.FindSetCursor(key))
item.ScCursor(sc);
clear.Enable(IsSearch());
}
String CodeBrowser::GetCodeRef(int i) const
@ -187,14 +189,11 @@ int SearchItemFilter(int c)
void CodeBrowser::Goto(const String& coderef)
{
search.Clear();
if(IsNull(coderef))
item.KillCursor();
else
if(coderef != GetCodeRef()) {
if(!IsNull(search_item) || !IsNull(search_scope)) {
search_scope <<= Null;
search_item <<= Null;
Load();
LoadScope();
}
@ -247,6 +246,19 @@ bool CodeBrowser::Key(dword key, int count)
return false;
}
bool CodeBrowser::IsSearch() const
{
return !IsNull(search) || !IsNull(search_item) || !IsNull(search);
}
void CodeBrowser::ClearSearch()
{
if(!IsSearch())
return;
search_scope <<= search_item <<= search <<= Null;
Load();
WhenClear();
}
CodeBrowser::CodeBrowser()
{
@ -267,4 +279,8 @@ CodeBrowser::CodeBrowser()
search.NullText("Find ");
search.SetFilter(SearchItemFilter);
search <<= THISBACK(Search);
search.AddFrame(clear);
clear.SetImage(BrowserImg::Clear());
clear.NoWantFocus();
clear <<= THISBACK(ClearSearch);
}