[haiku-commits] r39043 - haiku/trunk/src/kits/interface
- From: yourpalal2@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 22 Oct 2010 09:45:43 +0200 (CEST)
Author: yourpalal
Date: 2010-10-22 09:45:43 +0200 (Fri, 22 Oct 2010)
New Revision: 39043
Changeset: http://dev.haiku-os.org/changeset/39043
Modified:
haiku/trunk/src/kits/interface/Layout.cpp
Log:
Update BLayout::IndexOfView() to return NULL for NULL input, and check for
BViews that where added by BLayout, instead of by BViewLayoutItem.
Modified: haiku/trunk/src/kits/interface/Layout.cpp
===================================================================
--- haiku/trunk/src/kits/interface/Layout.cpp 2010-10-21 18:46:47 UTC (rev
39042)
+++ haiku/trunk/src/kits/interface/Layout.cpp 2010-10-22 07:45:43 UTC (rev
39043)
@@ -251,10 +251,14 @@
int32
BLayout::IndexOfView(BView* child) const
{
+ if (child == NULL)
+ return -1;
+
int itemCount = fItems.CountItems();
for (int32 i = 0; i < itemCount; 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;
}
Other related posts:
