Skip to content

Commit d929476

Browse files
committed
Invalid pointer fix and getClass fix
1 parent e9721f7 commit d929476

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -732,9 +732,6 @@ public boolean onTouchEvent(MotionEvent ev) {
732732
int initialVelocity = (int) VelocityTrackerCompat.getXVelocity(
733733
velocityTracker, mActivePointerId);
734734
final int scrollX = getScrollX();
735-
// final int widthWithMargin = getWidth();
736-
// final float pageOffset = (float) (scrollX % widthWithMargin) / widthWithMargin;
737-
// TODO test this. should get better flinging behavior
738735
final float pageOffset = (float) (scrollX - getDestScrollX(mCurItem)) / getBehindWidth();
739736
final int activePointerIndex = getPointerIndex(ev, mActivePointerId);
740737
if (mActivePointerId != INVALID_POINTER) {
@@ -780,7 +777,7 @@ public boolean onTouchEvent(MotionEvent ev) {
780777
private void determineDrag(MotionEvent ev) {
781778
final int activePointerId = mActivePointerId;
782779
final int pointerIndex = getPointerIndex(ev, activePointerId);
783-
if (activePointerId == INVALID_POINTER)
780+
if (activePointerId == INVALID_POINTER || pointerIndex == INVALID_POINTER)
784781
return;
785782
final float x = MotionEventCompat.getX(ev, pointerIndex);
786783
final float dx = x - mLastMotionX;

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
public class SlidingMenu extends RelativeLayout {
3333

34-
private static final String TAG = getClass().getSimpleName();
34+
private static final String TAG = SlidingMenu.class.getSimpleName();
3535

3636
public static final int SLIDING_WINDOW = 0;
3737
public static final int SLIDING_CONTENT = 1;
@@ -997,8 +997,6 @@ protected boolean fitSystemWindows(Rect insets) {
997997
}
998998
return true;
999999
}
1000-
1001-
private Handler mHandler = new Handler();
10021000

10031001
@TargetApi(Build.VERSION_CODES.HONEYCOMB)
10041002
public void manageLayers(float percentOpen) {
@@ -1008,7 +1006,7 @@ public void manageLayers(float percentOpen) {
10081006
final int layerType = layer ? View.LAYER_TYPE_HARDWARE : View.LAYER_TYPE_NONE;
10091007

10101008
if (layerType != getContent().getLayerType()) {
1011-
mHandler.post(new Runnable() {
1009+
getHandler().post(new Runnable() {
10121010
public void run() {
10131011
Log.v(TAG, "changing layerType. hardware? " + (layerType == View.LAYER_TYPE_HARDWARE));
10141012
getContent().setLayerType(layerType, null);

0 commit comments

Comments
 (0)