Taking out fading for now. Too many bugs.

Author: jfeinstein10

example/src/com/slidingmenu/example/ExampleActivity.java

@@ -37,6 +37,7 @@ public void onCreate(Bundle savedInstanceState) {
 		t.commit();
 
 		// customize the SlidingMenu
+		this.setSlidingActionBarEnabled(false);
 		getSlidingMenu().setShadowWidthRes(R.dimen.shadow_width);
 		getSlidingMenu().setShadowDrawable(R.drawable.shadow);
 		getSlidingMenu().setBehindOffsetRes(R.dimen.actionbar_home_width);
@@ -48,6 +49,7 @@ public void onCreate(Bundle savedInstanceState) {
 		actionBar.setDisplayHomeAsUpEnabled(true);
 	}
 
+	
 	public class PagerAdapter extends FragmentPagerAdapter implements 
 	ViewPager.OnPageChangeListener, TabListener{
 

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

@@ -849,6 +849,9 @@ protected void onLayout(boolean changed, int l, int t, int r, int b) {
 					child.layout(childLeft, childTop,
 							childLeft + child.getMeasuredWidth(),
 							childTop + child.getMeasuredHeight());
+					Log.v(TAG, "top: " + childTop + ", left: " + childLeft +
+							", height: " + child.getMeasuredHeight() + 
+							", width:" + child.getMeasuredWidth());
 				}
 			}
 			mTopPageBounds = paddingTop;
@@ -1213,7 +1216,6 @@ public boolean onTouchEvent(MotionEvent ev) {
 						scrollX = leftBound;
 					} else if (scrollX > rightBound) {
 						scrollX = rightBound;
-						//						scrollX = getChildWidth(mCurItem);
 					}
 					// Don't lose the rounded component
 					mLastMotionX += scrollX - (int) scrollX;
@@ -1312,10 +1314,17 @@ protected void onDraw(Canvas canvas) {
 				mShadowDrawable.draw(canvas);
 			}
 
-			if (mFadeEnabled) {
-				final float openPercent = (mScroller.getCurrX()) / (float) behindWidth;
-				onDrawBehindFade(canvas, openPercent, behindWidth);
-			}
+//			if (mFadeEnabled) {
+//				float openPercent = 0;
+//		        if (mScrollState == SCROLL_STATE_DRAGGING) {
+//		            openPercent= (behindWidth - Math.min(mLastMotionX, behindWidth)) / (float) behindWidth;
+//		            Log.v("STATE_DRAGGING", "openPercent: "+openPercent);
+//		        } else {
+//		            openPercent= (mScroller.getCurrX()) / (float) behindWidth;
+//		            Log.v("STATE_SETTLING", "openPercent: "+openPercent+", scrollerX: "+mScroller.getCurrX());
+//		        }
+//				onDrawBehindFade(canvas, openPercent, behindWidth);
+//			}
 		}
 
 		private float mFadeDegree;

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

@@ -8,7 +8,7 @@
 
 public class CustomViewBehind extends CustomViewAbove {
 
-	private static final String TAG = "CustomViewBehind2";
+	private static final String TAG = "CustomViewBehind";
 
 	public CustomViewBehind(Context context) {
 		this(context, null);

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

@@ -157,7 +157,11 @@ public int getBehindOffset() {
 	 * @param i The margin on the right of the screen that the behind view scrolls to
 	 */
 	public void setBehindOffset(int i) {
-		((RelativeLayout.LayoutParams)mViewBehind.getLayoutParams()).setMargins(0, 0, i, 0);
+		RelativeLayout.LayoutParams params = ((RelativeLayout.LayoutParams)mViewBehind.getLayoutParams());
+		int bottom = params.bottomMargin;
+		int top = params.topMargin;
+		int left = params.leftMargin;
+		((RelativeLayout.LayoutParams)mViewBehind.getLayoutParams()).setMargins(left, top, i, bottom);
 	}
 
 	/**

library/src/com/slidingmenu/lib/app/SlidingActivityHelper.java

@@ -8,6 +8,7 @@
 import android.view.ViewGroup.LayoutParams;
 import android.widget.LinearLayout;
 
+import com.slidingmenu.lib.R;
 import com.slidingmenu.lib.SlidingMenu;
 
 public class SlidingActivityHelper {
@@ -27,7 +28,7 @@ public SlidingActivityHelper(Activity activity) {
 	}
 
 	public void onCreate(Bundle savedInstanceState) {
-		mSlidingMenu = new SlidingMenu(mActivity);
+		mSlidingMenu = (SlidingMenu) mActivity.getLayoutInflater().inflate(R.layout.slidingmenumain, null);
 	}
 
 	public void onPostCreate(Bundle savedInstanceState) {
@@ -44,15 +45,15 @@ public void onPostCreate(Bundle savedInstanceState) {
 				decor.removeView(child);
 				newDecor.addView(child);
 			}
-			decor.addView(mSlidingMenu, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT));
+			decor.addView(mSlidingMenu);
 			mSlidingMenu.setViewAbove(newDecor);
 		} else {
 			ViewGroup parent = (ViewGroup) mViewAbove.getParent();
 			if (parent != null) {
 				parent.removeView(mViewAbove);
 			}
 			mSlidingMenu.setViewAbove(mViewAbove);
-			mActivity.setContentView(mSlidingMenu);
+			mActivity.getWindow().setContentView(mSlidingMenu);
 		}
 	}