Added fullscreen touch mode. Now you can set if the entire screen is a valid touch to slide the menu open.

jfeinstein10 · jfeinstein10 · commit 3dc0234060c9 · 2012-07-08T22:55:00.000-07:00
diff --git a/example/src/com/slidingmenu/example/ExampleActivity.java b/example/src/com/slidingmenu/example/ExampleActivity.java
@@ -8,6 +8,7 @@
 import com.actionbarsherlock.app.ActionBar.TabListener;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
+import com.slidingmenu.lib.SlidingMenu;
 import com.slidingmenu.lib.app.SlidingListActivity;
 
 public class ExampleActivity extends SlidingListActivity implements TabListener {
@@ -18,6 +19,7 @@ public void onCreate(Bundle savedInstanceState) {
 		setBehindContentView(R.layout.main2);
 		getSlidingMenu().setBehindOffsetRes(R.dimen.actionbar_home_width);
 		getSlidingMenu().setBehindScrollScale(0.5f);
+		getSlidingMenu().setAboveTouchMode(SlidingMenu.TOUCHMODE_FULLSCREEN);
 		ActionBar actionBar = getSupportActionBar();
 		actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
 		actionBar.setDisplayHomeAsUpEnabled(true);
diff --git a/library/src/com/slidingmenu/lib/CustomViewAbove.java b/library/src/com/slidingmenu/lib/CustomViewAbove.java
@@ -1182,11 +1182,44 @@ private void completeScroll() {
 			}
 		}
 
+		private int mAboveTouchMode = SlidingMenu.TOUCHMODE_MARGIN;
+		private int mBehindTouchMode = SlidingMenu.TOUCHMODE_MARGIN;
+		
+		public void setAboveTouchMode(int i) {
+			mAboveTouchMode = i;
+		}
+		
+		public int getAboveTouchMode() {
+			return mAboveTouchMode;
+		}
+		
+		public void setBehindTouchMode(int i) {
+			mBehindTouchMode = i;
+		}
+		
+		public int getBehindTouchMode() {
+			return mBehindTouchMode;
+		}
+
 		private boolean thisTouchAllowed(float x) {
 			if (isMenuOpen()) {
-				return x >= getBehindWidth() && x <= getWidth();
+				switch (mBehindTouchMode) {
+				case SlidingMenu.TOUCHMODE_FULLSCREEN:
+					return true;
+				case SlidingMenu.TOUCHMODE_MARGIN:
+					return x >= getBehindWidth() && x <= getWidth();
+				default:
+					return false;
+				}
 			} else {
-				return x >= 0 && x <= mSlidingMenuThreshold;
+				switch (mAboveTouchMode) {
+				case SlidingMenu.TOUCHMODE_FULLSCREEN:
+					return true;
+				case SlidingMenu.TOUCHMODE_MARGIN:
+					return x >= 0 && x <= mSlidingMenuThreshold;
+				default:
+					return false;
+				}
 			}
 		}
 
diff --git a/library/src/com/slidingmenu/lib/SlidingMenu.java b/library/src/com/slidingmenu/lib/SlidingMenu.java
@@ -9,6 +9,9 @@
 import android.widget.RelativeLayout;
 
 public class SlidingMenu extends RelativeLayout {
+
+	public static final int TOUCHMODE_FULLSCREEN = 0;
+	public static final int TOUCHMODE_MARGIN = 1;
 	
 	private CustomViewAbove mViewAbove;
 	private CustomViewBehind mViewBehind;
@@ -156,4 +159,28 @@ public void setBehindScrollScale(float f) {
 		mViewAbove.setScrollScale(f);
 	}
 
+	public int getAboveTouchMode() {
+		return mViewAbove.getAboveTouchMode();
+	}
+	
+	public void setAboveTouchMode(int i) {
+		if (i != TOUCHMODE_FULLSCREEN && i != TOUCHMODE_MARGIN) {
+			throw new IllegalStateException("TouchMode must be set to either" +
+					"TOUCHMODE_FULLSCREEN or TOUCHMODE_MARGIN.");
+		}
+		mViewAbove.setAboveTouchMode(i);
+	}
+
+	public int getBehindTouchMode() {
+		return mViewAbove.getBehindTouchMode();
+	}
+	
+	public void setBehindTouchMode(int i) {
+		if (i != TOUCHMODE_FULLSCREEN && i != TOUCHMODE_MARGIN) {
+			throw new IllegalStateException("TouchMode must be set to either" +
+					"TOUCHMODE_FULLSCREEN or TOUCHMODE_MARGIN.");
+		}
+		mViewAbove.setBehindTouchMode(i);
+	}
+
 }
