Merge pull request #5364 from salachi/TIMOB-8797

[TIMOB-8797] set the scrollview as the parent to the child views
tidev · Feb 28, 2014 · 8c619f3 · 8c619f3
2 parents 6c4fa6b + a5491f6
commit 8c619f3
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIScrollableView.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIScrollableView.java
@@ -21,7 +21,6 @@
 import org.appcelerator.titanium.view.TiUIView;
 
 import ti.modules.titanium.ui.ScrollableViewProxy;
-import ti.modules.titanium.ui.widget.TiUIScrollView.TiScrollViewLayout;
 import ti.modules.titanium.ui.widget.listview.ListItemProxy;
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -326,6 +325,7 @@ public void addView(TiViewProxy proxy)
 	{
 		if (!mViews.contains(proxy)) {
 			proxy.setActivity(this.proxy.getActivity());
+			proxy.setParent(this.proxy);
 			mViews.add(proxy);
 			getProxy().setProperty(TiC.PROPERTY_VIEWS, mViews.toArray());
 			mAdapter.notifyDataSetChanged();
@@ -336,6 +336,7 @@ public void removeView(TiViewProxy proxy)
 	{
 		if (mViews.contains(proxy)) {
 			mViews.remove(proxy);
+			proxy.setParent(null);
 			getProxy().setProperty(TiC.PROPERTY_VIEWS, mViews.toArray());
 			mAdapter.notifyDataSetChanged();
 		}
@@ -419,6 +420,7 @@ private void clearViewsList()
 		}
 		for (TiViewProxy viewProxy : mViews) {
 			viewProxy.releaseViews();
+			viewProxy.setParent(null);
 		}
 		mViews.clear();
 	}
@@ -435,6 +437,7 @@ public void setViews(Object viewsObject)
 				if (views[i] instanceof TiViewProxy) {
 					TiViewProxy tv = (TiViewProxy)views[i];
 					tv.setActivity(activity);
+					tv.setParent(this.proxy);
 					mViews.add(tv);
 					changed = true;
 				}
@@ -461,6 +464,7 @@ public void release()
 		if (mViews != null) {
 			for (TiViewProxy viewProxy : mViews) {
 				viewProxy.releaseViews();
+				viewProxy.setParent(null);
 			}
 			mViews.clear();
 		}