corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 831781 - Add support for zooming in/out with gamepad zoom buttons. r=Cwiiis

Browse Source
This commit is contained in:
Kartikaya Gupta
2013-03-01 22:50:48 -05:00
parent ca06281561
commit bffe03292d
3 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
mobile/android/base/gfx/JavaPanZoomController.java
View File

@@ -23,6 +23,7 @@ import android.os.Build;
import android.util.FloatMath;
import android.util.Log;
import android.view.GestureDetector;
import android.view.KeyEvent;
import android.view.InputDevice;
import android.view.MotionEvent;
import android.view.View;
@@ -219,6 +220,26 @@ class JavaPanZoomController
}
}
/** This function MUST be called on the UI thread */
@Override
public boolean onKeyEvent(KeyEvent event) {
if (Build.VERSION.SDK_INT <= 11) {
return false;
}
if ((event.getSource() & InputDevice.SOURCE_GAMEPAD) == InputDevice.SOURCE_GAMEPAD
&& event.getAction() == KeyEvent.ACTION_DOWN) {
switch (event.getKeyCode()) {
case KeyEvent.KEYCODE_ZOOM_IN:
return animatedScale(0.2f);
case KeyEvent.KEYCODE_ZOOM_OUT:
return animatedScale(-0.2f);
}
}
return false;
}
/** This function MUST be called on the UI thread */
@Override
public boolean onMotionEvent(MotionEvent event) {
@@ -994,6 +1015,22 @@ class JavaPanZoomController
return true;
}
private boolean animatedScale(float zoomDelta) {
if (mState != PanZoomState.NOTHING && mState != PanZoomState.BOUNCE) {
return false;
}
synchronized (mTarget.getLock()) {
ImmutableViewportMetrics metrics = getMetrics();
float oldZoom = metrics.zoomFactor;
float newZoom = oldZoom + zoomDelta;
float adjustedZoom = getAdjustedZoomFactor(newZoom / oldZoom);
PointF center = new PointF(metrics.getWidth() / 2.0f, metrics.getHeight() / 2.0f);
metrics = metrics.scaleTo(adjustedZoom, center);
bounce(getValidViewportMetrics(metrics), PanZoomState.BOUNCE);
}
return true;
}
private float getAdjustedZoomFactor(float zoomRatio) {
/*
* Apply edge resistance if we're zoomed out smaller than the page size by scaling the zoom