github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-07 22:03:42 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: Navigator fix

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@8528 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2015-06-11 07:42:35 +00:00
parent 49f0a22ec9
commit 9523bc2d98
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
uppsrc/ide/Navigator.cpp
View file

@ -51,7 +51,9 @@ void DrawFileName(Draw& w, const Rect& r, const String& h, Color ink)
int PaintFileName(Draw& w, const Rect& r, String h, Color ink)
{
if(h.GetCount())
if(*h == '\xff')
h.Remove(0, 1);
if(*h == '~')
h.Remove(0, 1);
return DrawFileName0(w, r, h, ink, 0);
}
@ -339,6 +341,8 @@ int Navigator::NavigatorDisplay::DoPaint(Draw& w, const Rect& r, const Value& q,
if(findarg(m.kind, KIND_FILE, KIND_NEST) >= 0) {
w.DrawRect(r, focuscursor ? paper : m.kind == KIND_NEST ? Blend(SColorMark, SColorPaper, 220)
: SColorFace);
DUMPHEX(m.type);
DDUMP((int)m.kind);
if(m.kind == KIND_FILE)
return PaintFileName(w, r, m.type, ink);
String h = FormatNest(m.type);
@ -397,7 +401,11 @@ void Navigator::NavGroup(bool local)
if(m.kind == TYPEDEF)
g.Trim(max(g.ReverseFind("::"), 0));
if(IsNull(g))
g = "\xff" + GetSourceFilePath(m.decl_file);
if(m.pass)
g = "\xff~" + GetSourceFilePath(m.decl_file); // Second pass contains less matching items, sort it after the first pass
else
g = "\xff" + GetSourceFilePath(m.decl_file);
else
if(m.pass)
g = "~" + g; // Second pass contains less matching items, sort it after the first pass
if(local)