i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* this should fix BWindow::FindChild(BPoint)

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21537 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2007-07-01 14:57:41 +00:00
parent 028e368c21
commit 7a90948b20
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/Window.cpp
+17 -11
View File
@@ -1082,7 +1082,8 @@ FrameMoved(origin);
case _UPDATE_: case _UPDATE_:
{ {
//bigtime_t now = system_time(); //bigtime_t now = system_time();
//bigtime_t drawTime = 0;
STRACE(("info:BWindow handling _UPDATE_.\n")); STRACE(("info:BWindow handling _UPDATE_.\n"));
BRect updateRect; BRect updateRect;
@@ -1136,23 +1137,26 @@ FrameMoved(origin);
// draw // draw
int32 count = tokens.CountItems(); int32 count = tokens.CountItems();
for (int32 i = 0; i < count; i++) { for (int32 i = 0; i < count; i++) {
//bigtime_t drawStart = system_time();
if (BView* view = _FindView((int32)tokens.ItemAtFast(i))) if (BView* view = _FindView((int32)tokens.ItemAtFast(i)))
view->_Draw(updateRect); view->_Draw(updateRect);
else else
printf("_UPDATE_ - didn't find view by token: %ld\n", (int32)tokens.ItemAtFast(i)); printf("_UPDATE_ - didn't find view by token: %ld\n", (int32)tokens.ItemAtFast(i));
//drawTime += system_time() - drawStart;
} }
// TODO: the tokens are actually hirachically sorted, // TODO: the tokens are actually hirachically sorted,
// so traversing the list in revers and calling // so traversing the list in revers and calling
// child->DrawAfterChildren would actually work correctly, // child->DrawAfterChildren would actually work correctly,
// only that drawing outside a view is not yet supported // only that drawing outside a view is not yet supported
// in the app_server. // in the app_server.
//printf(" %ld views drawn, total Draw() time: %lld\n", count, drawTime);
} }
fLink->StartMessage(AS_END_UPDATE); fLink->StartMessage(AS_END_UPDATE);
fLink->Flush(); fLink->Flush();
fInTransaction = false; fInTransaction = false;
//printf("BWindow(%s) - UPDATE took %lld usecs\n", Title(), system_time() - now); //printf("BWindow(%s) - UPDATE took %lld usecs\n", Title(), system_time() - now);
break; break;
} }
@@ -1658,6 +1662,8 @@ BView *
BWindow::FindView(BPoint point) const BWindow::FindView(BPoint point) const
{ {
BAutolock _(const_cast<BWindow*>(this)); BAutolock _(const_cast<BWindow*>(this));
// point is assumed to be in window coordinates,
// fTopView has same bounds as window
return _FindView(fTopView, point); return _FindView(fTopView, point);
} }
@@ -3274,20 +3280,20 @@ BWindow::_FindView(int32 token)
} }
BView * BView*
BWindow::_FindView(BView *view, BPoint point) const BWindow::_FindView(BView* view, BPoint point) const
{ {
// TODO: this is totally broken (bounds vs. frame) - since // point is assumed to be already in view's coordinates
// BView::Bounds() potentially queries the app_server // TODO: since BView::Bounds() potentially queries the app_server anyway,
// anyway, we could just let the app_server answer this // we could just let the app_server answer this query directly.
// query directly.
if (view->Bounds().Contains(point) && !view->fFirstChild) if (view->Bounds().Contains(point) && !view->fFirstChild)
return view; return view;
BView *child = view->fFirstChild; BView* child = view->fFirstChild;
while (child != NULL) { while (child != NULL) {
if ((view = _FindView(child, point)) != NULL) BPoint childPoint = point - child->LeftTop();
if ((view = _FindView(child, childPoint)) != NULL)
return view; return view;
child = child->fNextSibling; child = child->fNextSibling;
@@ -3297,7 +3303,7 @@ BWindow::_FindView(BView *view, BPoint point) const
} }
BView * BView*
BWindow::_FindNextNavigable(BView* focus, uint32 flags) BWindow::_FindNextNavigable(BView* focus, uint32 flags)
{ {
if (focus == NULL) if (focus == NULL)