Now working with CustomViewBehind2. Methods calls not as initially planned. Must go back and fix.

Author: jfeinstein10

library/src/com/slidingmenu/lib/CustomViewAbove.java

@@ -24,6 +24,7 @@
 import android.view.FocusFinder;
 import android.view.Gravity;
 import android.view.KeyEvent;
+import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.SoundEffectConstants;
 import android.view.VelocityTracker;
@@ -33,6 +34,8 @@
 import android.view.ViewParent;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.animation.Interpolator;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.Scroller;
 
 public class CustomViewAbove extends ViewGroup {
@@ -124,7 +127,7 @@ public float getInterpolation(float t) {
 
 		private boolean mLastTouchAllowed = false;
 		private int mSlidingMenuThreshold = 30;
-		private CustomViewBehind mCustomViewBehind;
+		private CustomViewBehind2 mCustomViewBehind2;
 		private boolean mEnabled = true;
 
 		private OnPageChangeListener mOnPageChangeListener;
@@ -246,8 +249,10 @@ void initCustomViewAbove(boolean isAbove) {
 			mMaximumVelocity = configuration.getScaledMaximumFlingVelocity();
 
 			if (isAbove) {
-				View v = new View(getContext());
-				v.setBackgroundColor(android.R.color.transparent);
+				View v = new LinearLayout(getContext());
+				v.setBackgroundResource(android.R.color.transparent);
+//				ImageView v = new ImageView(getContext());
+//				v.setImageResource(R.drawable.ic_launcher);
 				setMenu(v);
 			}
 
@@ -509,10 +514,10 @@ public int getChildWidth(int i) {
 		}
 
 		public int getBehindWidth() {
-			if (mCustomViewBehind == null) {
+			if (mCustomViewBehind2 == null) {
 				return 0;
 			} else {
-				return mCustomViewBehind.getWidth();
+				return mCustomViewBehind2.getWidth();
 			}
 		}
 
@@ -771,7 +776,7 @@ protected void setMenu(View v) {
 			if (mWindow != null) {
 				removeView((View)mWindow.object);
 			}
-			addView(v, 0);
+			addView(v);
 			mWindow = ii;
 		}
 
@@ -782,12 +787,12 @@ public void setContent(View v) {
 			if (mContent != null) {
 				removeView((View)mContent.object);
 			}
-			addView(v, 1);
+			addView(v);
 			mContent = ii;
 		}
 
-		public void setCustomViewBehind(CustomViewBehind cvb) {
-			mCustomViewBehind = cvb;
+		public void setCustomViewBehind2(CustomViewBehind2 cvb) {
+			mCustomViewBehind2 = cvb;
 		}
 
 		public void addView(View child, int index, ViewGroup.LayoutParams params) {
@@ -816,9 +821,9 @@ public void addView(View child, int index, ViewGroup.LayoutParams params) {
 		}
 
 		ItemInfo infoForChild(View child) {
-			if (child.equals(mWindow.object)) {
+			if (mWindow != null && child.equals(mWindow.object)) {
 				return mWindow;
-			} else if (child.equals(mContent.object)) {
+			} else if (mContent != null && child.equals(mContent.object)) {
 				return mContent;
 			}
 			return null;
@@ -880,7 +885,8 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
 						} else if (consumeHorizontal) {
 							heightMode = MeasureSpec.EXACTLY;
 						}
-
+						int pos = infoForChild(child).position;
+						childWidthSize = getChildWidth(pos);
 						final int widthSpec = MeasureSpec.makeMeasureSpec(childWidthSize, widthMode);
 						final int heightSpec = MeasureSpec.makeMeasureSpec(childHeightSize, heightMode);
 						child.measure(widthSpec, heightSpec);
@@ -966,11 +972,11 @@ protected void onLayout(boolean changed, int l, int t, int r, int b) {
 				final View child = getChildAt(i);
 				if (child.getVisibility() != GONE) {
 					final LayoutParams lp = (LayoutParams) child.getLayoutParams();
-					ItemInfo ii;
+					int pos = infoForChild(child).position;
 					int childLeft = 0;
 					int childTop = 0;
-					childLeft = getChildLeft(i);
-					int childWidth = getChildWidth(i);
+					childLeft = getChildLeft(pos);
+					int childWidth = getChildWidth(pos);
 					Log.v(TAG, "Child#" + i + " left:" + childLeft +
 							" right:" + (childLeft + child.getMeasuredWidth()));
 					child.layout(childLeft, childTop,
@@ -1449,8 +1455,8 @@ public void setScrollScale(float f) {
 		@Override
 		public void scrollTo(int x, int y) {
 			super.scrollTo(x, y);
-			if (mCustomViewBehind != null && mEnabled) {
-				mCustomViewBehind.scrollTo((int)(x*mScrollScale), y);
+			if (mCustomViewBehind2 != null && mEnabled) {
+				mCustomViewBehind2.scrollTo((int)(x*mScrollScale), y);
 			}
 		}
 

library/src/com/slidingmenu/lib/CustomViewBehind2.java

@@ -15,7 +15,7 @@ public CustomViewBehind2(Context context) {
 	}
 
 	public CustomViewBehind2(Context context, AttributeSet attrs) {
-		super(context, attrs, false);
+		super(context, attrs, true);
 	}
 
 	public int getDestScrollX() {
@@ -56,10 +56,10 @@ public int getBehindWidth() {
 		return params.width;
 	}
 
-	@Override
-	public void setContent(View v) {
-		setMenu(v);
-	}
+//	@Override
+//	public void setContent(View v) {
+//		super.setMenu(v);
+//	}
 
 	@Override
 	public boolean onInterceptTouchEvent(MotionEvent e) {

library/src/com/slidingmenu/lib/SlidingMenu.java

@@ -13,7 +13,7 @@ public class SlidingMenu extends RelativeLayout {
 	public static final int TOUCHMODE_FULLSCREEN = 1;
 
 	private CustomViewAbove mViewAbove;
-	private CustomViewBehind mViewBehind;
+	private CustomViewBehind2 mViewBehind;
 
 	public SlidingMenu(Context context) {
 		this(context, null);
@@ -27,13 +27,13 @@ public SlidingMenu(Context context, AttributeSet attrs, int defStyle) {
 		super(context, attrs, defStyle);
 
 		LayoutParams behindParams = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
-		mViewBehind = new CustomViewBehind(context);
+		mViewBehind = new CustomViewBehind2(context);
 		addView(mViewBehind, behindParams);
 		LayoutParams aboveParams = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT);
 		mViewAbove = new CustomViewAbove(context);
 		addView(mViewAbove, aboveParams);
-		// register the CustomViewBehind with the CustomViewAbove
-		mViewAbove.setCustomViewBehind(mViewBehind);
+		// register the CustomViewBehind2 with the CustomViewAbove
+		mViewAbove.setCustomViewBehind2(mViewBehind);
 
 		// now style everything!
 		TypedArray ta = context.obtainStyledAttributes(attrs, R.styleable.SlidingMenu);
@@ -97,13 +97,13 @@ public boolean isSlidingEnabled() {
 	public void setStatic(boolean b) {
 		if (b) {
 			setSlidingEnabled(false);
-			mViewAbove.setCustomViewBehind(null);
+			mViewAbove.setCustomViewBehind2(null);
 			mViewAbove.setCurrentItem(1);
 			mViewBehind.setCurrentItem(0);	
 		} else {
 			mViewAbove.setCurrentItem(1);
 			mViewBehind.setCurrentItem(1);
-			mViewAbove.setCustomViewBehind(mViewBehind);
+			mViewAbove.setCustomViewBehind2(mViewBehind);
 			setSlidingEnabled(true);
 		}
 	}