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

Update BLayout::IndexOfView() to return NULL for NULL input, and check for BViews that where added by BLayout, instead of by BViewLayoutItem.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39043 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Alex Wilson
2010-10-22 07:45:43 +00:00
parent b23e9af5b5
commit 3ea301f30e
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/Layout.cpp
+5 -1
View File
@@ -251,10 +251,14 @@ BLayout::IndexOfItem(const BLayoutItem* item) const
int32 int32
BLayout::IndexOfView(BView* child) const BLayout::IndexOfView(BView* child) const
{ {
if (child == NULL)
return -1;
int itemCount = fItems.CountItems(); int itemCount = fItems.CountItems();
for (int32 i = 0; i < itemCount; i++) { for (int32 i = 0; i < itemCount; i++) {
BLayoutItem* item = (BLayoutItem*)fItems.ItemAt(i); BLayoutItem* item = (BLayoutItem*)fItems.ItemAt(i);
if (dynamic_cast<BViewLayoutItem*>(item) && item->View() == child) if (item->View() == child && (dynamic_cast<BViewLayoutItem*>(item)
|| dynamic_cast<BLayout*>(item)))
return i; return i;
} }