Adjusting behind visibility better

jfeinstein10 · jfeinstein10 · commit 56c2ffeb050a · 2012-11-27T10:52:31.000-05:00
diff --git a/example/res/layout/nested_menu.xml b/example/res/layout/nested_menu.xml
diff --git a/example/src/com/slidingmenu/example/LeftAndRightActivity.java b/example/src/com/slidingmenu/example/LeftAndRightActivity.java
@@ -37,14 +37,12 @@ public void onCreate(Bundle savedInstanceState) {
 			@Override
 			public void onOpened() {
 				getSlidingMenu().setTouchModeAbove(SlidingMenu.TOUCHMODE_NONE);
-				getSlidingMenu().getMenu().setVisibility(View.GONE);
 			}
 		});
 		mRight.setOnClosedListener(new OnClosedListener() {
 			@Override
 			public void onClosed() {
 				getSlidingMenu().setTouchModeAbove(SlidingMenu.TOUCHMODE_MARGIN);
-				getSlidingMenu().getMenu().setVisibility(View.VISIBLE);
 			}			
 		});
 		
diff --git a/library/AndroidManifest.xml b/library/AndroidManifest.xml
@@ -6,7 +6,7 @@
 
     <uses-sdk
         android:minSdkVersion="5"
-        android:targetSdkVersion="16" />
+        android:targetSdkVersion="17" />
 
     <application>
         <uses-library android:name="com.google.android.maps" />
diff --git a/library/src/com/slidingmenu/lib/CustomViewAbove.java b/library/src/com/slidingmenu/lib/CustomViewAbove.java
@@ -914,14 +914,17 @@ public void scrollTo(int x, int y) {
 		super.scrollTo(x, y);
 		mScrollX = x;
 		if (mCustomViewBehind != null && mEnabled) {
+			int vis = View.VISIBLE;
 			if (mMode == SlidingMenu.LEFT) {
+				if (x >= getContentLeft()) vis = View.GONE;
 				mCustomViewBehind.scrollTo((int)((x + getBehindWidth())*mScrollScale), y);
 			} else if (mMode == SlidingMenu.RIGHT) {
-				// TODO right!
+				if (x <= getContentLeft()) vis = View.GONE;
 				mCustomViewBehind.scrollTo((int)(getBehindWidth() - getWidth() + 
 						(x-getBehindWidth())*mScrollScale), y);
 			}
-		}
+			mCustomViewBehind.setVisibility(vis);
+		}	
 		if (mShadowDrawable != null || mSelectorDrawable != null)
 			invalidate();
 	}
@@ -935,7 +938,7 @@ private int determineTargetPage(float pageOffset, int velocity, int deltaX) {
 			//				targetPage += velocity > 0 ? 0: 1;
 			//			}
 		} else {
-			targetPage = (int) (mCurItem + pageOffset + 0.5f);
+			targetPage = (int) Math.round(mCurItem + pageOffset);
 		}
 		return targetPage;
 	}
diff --git a/library/src/com/slidingmenu/lib/MenuInterface.java b/library/src/com/slidingmenu/lib/MenuInterface.java
@@ -0,0 +1,31 @@
+package com.slidingmenu.lib;
+
+import android.graphics.Canvas;
+import android.graphics.drawable.Drawable;
+import android.view.View;
+
+public abstract class MenuInterface {
+
+	public abstract void scrollBehindTo(int x, int y, 
+			CustomViewBehind cvb, float scrollScale);
+	
+	public abstract int getMenuLeft(CustomViewBehind cvb, View content);
+	
+	public abstract int getAbsLeftBound(CustomViewBehind cvb, View content);
+
+	public abstract int getAbsRightBound(CustomViewBehind cvb, View content);
+
+	public abstract boolean marginTouchAllowed(View content, int x, int threshold);
+	
+	public abstract boolean menuOpenTouchAllowed(View content, int x);
+	
+	public abstract boolean menuClosedSlideAllowed(int x);
+	
+	public abstract boolean menuOpenSlideAllowed(int x);
+	
+	public abstract void drawShadow(Canvas canvas, Drawable shadow, int width);
+	
+	public abstract void drawFade(Canvas canvas, int alpha, 
+			CustomViewBehind cvb, View content);
+	
+}

Original file line number	Diff line number	Diff line change
`@@ -37,14 +37,12 @@ public void onCreate(Bundle savedInstanceState) {`
`37`	`37`	`@Override`
`38`	`38`	`public void onOpened() {`
`39`	`39`	`getSlidingMenu().setTouchModeAbove(SlidingMenu.TOUCHMODE_NONE);`
`40`		`- getSlidingMenu().getMenu().setVisibility(View.GONE);`
`41`	`40`	`}`
`42`	`41`	`});`
`43`	`42`	`mRight.setOnClosedListener(new OnClosedListener() {`
`44`	`43`	`@Override`
`45`	`44`	`public void onClosed() {`
`46`	`45`	`getSlidingMenu().setTouchModeAbove(SlidingMenu.TOUCHMODE_MARGIN);`
`47`		`- getSlidingMenu().getMenu().setVisibility(View.VISIBLE);`
`48`	`46`	`}`
`49`	`47`	`});`
`50`	`48`