[haiku-commits] r39063 - haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker
- From: alex@xxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 23 Oct 2010 12:11:12 +0200 (CEST)
Author: aldeck
Date: 2010-10-23 12:11:12 +0200 (Sat, 23 Oct 2010)
New Revision: 39063
Changeset: http://dev.haiku-os.org/changeset/39063
Modified:
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/PoseViewController.cpp
Log:
* Remove workaround for LayoutItemForView() since yourpalal fixed the
BLayout::IndexOfView(..) issue.
Modified:
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/PoseViewController.cpp
===================================================================
---
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/PoseViewController.cpp
2010-10-23 10:06:38 UTC (rev 39062)
+++
haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker/PoseViewController.cpp
2010-10-23 10:11:12 UTC (rev 39063)
@@ -113,37 +113,16 @@
{
if (view != NULL) {
BLayout* layout = NULL;
-
- if (view->Parent() != NULL) {
- // control is on a view
+
+ if (view->Parent() != NULL)
layout = view->Parent()->GetLayout();
- } else if (view->Window() != NULL) {
- // control is on a window
+ else if (view->Window() != NULL)
layout = view->Window()->GetLayout();
- } else {
- // somethings wrong
- return NULL;
- }
-
- if (layout != NULL) {
-
- //int32 index = layout->IndexOfView(view);
- //BLayoutItem* layoutItem = layout->ItemAt(index);
- //return layoutItem;
- // This above doesn't find the layout item as
expected since
- // the recent layout api changes, so we use the
method
- // below (it's not necessarily a
BViewLayoutItem now) until
- // that's fixed.
-
- int itemCount = layout->CountItems();
- for (int32 i = 0; i < itemCount; i++) {
- BLayoutItem* item =
(BLayoutItem*)layout->ItemAt(i);
- if (item->View() == view) {
- //printf("layout->ItemAt(%li) = view =
%p\n", i, view);
- return item;
- }
- }
- }
+ else
+ return NULL;
+
+ if (layout != NULL)
+ return layout->ItemAt(layout->IndexOfView(view));
}
return NULL;
}
@@ -152,7 +131,6 @@
void
PoseViewController::SetControlVisible(BView* control, bool visible)
{
- printf("PoseViewController::SetControlVisible %u\n", visible);
BLayoutItem* layoutItem = LayoutItemForView(control);
if (layoutItem != NULL)
layoutItem->SetVisible(visible);
Other related posts:
- » [haiku-commits] r39063 - haiku/branches/developer/aldeck/tracker_layout/src/kits/tracker - alex
