github-starred/ultimatepp
Watch
2
0
Fork
You've already forked ultimatepp
 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-10-06 00:30:10 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

bazaar: CtrlFinder, CtrlMover, CtrlPos various fixes with deep search and Frames

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@3282 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
kohait 2011-03-18 15:42:36 +00:00
commit f2d5eb0db4
9 changed files with 31 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

18
bazaar/CtrlFinder/CtrlFinder.cpp
View file

@ -37,8 +37,7 @@ Ctrl* ChildAtPoint(Ctrl& par, Point& pt, bool ignoreframe)
Ctrl* GetCtrl(Ctrl& c, Point& p, bool ignoreframe, bool deep)
{
Ctrl* q = ChildAtPoint(c, p, ignoreframe);
if(!q) return q;
if(deep && q)
if(q && deep)
{
Point pt(p);
Ctrl* qc = GetCtrl(*q, pt, ignoreframe, deep);
@ -47,7 +46,6 @@ Ctrl* GetCtrl(Ctrl& c, Point& p, bool ignoreframe, bool deep)
p = pt;
return qc;
}
return q;
}
return q;
}
@ -70,28 +68,28 @@ void CtrlFinder::Visit(Ctrl& c)
void CtrlFinder::Clear()
{
c = NULL;
ctrl = NULL;
Remove();
V::Clear();
}
void CtrlFinder::OnCtrlLeft(Point p, dword keyflags)
{
c = NULL;
ctrl = NULL;
if(IsEmpty()) return;
Point pt(p);
c = ::GetCtrl(Get(), pt, ignoreframe, deep);
if(c) WhenLeftDown(*c, p, keyflags);
ctrl = ::GetCtrl(Get(), pt, ignoreframe, deep);
if(ctrl) WhenLeftDown(*ctrl, p, keyflags);
else WhenMissed(p, keyflags);
Action();
}
void CtrlFinder::OnCtrlRight(Point p, dword keyflags)
{
c = NULL;
ctrl = NULL;
if(IsEmpty()) return;
Point pt(p);
c = ::GetCtrl(Get(), pt, ignoreframe, deep);
if(c) WhenRightDown(*c, p, keyflags);
ctrl = ::GetCtrl(Get(), pt, ignoreframe, deep);
if(ctrl) WhenRightDown(*ctrl, p, keyflags);
else WhenMissed(p, keyflags);
Action();
}