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

Bug 1197811 - Turn the LayerView into a ScrollView that scrolls to shift the surface rather than using setTranslation. r=rbarker

Browse Source 
On Gingerbread devices (Android API 9 or 10) the ViewHelper.setTranslationY code
doesn't work to move the SurfaceView. In order to acheive that effect I turned
LayerView into a ScrollView with a dummy element at the top, and allow it to
scroll. This allows the SurfaceView to move as desired. A few places in the code
were assuming that the LayerView and SurfaceView were always at the same screen
location (which was true before but not any more) and so those sites needed
some updating as well.
This commit is contained in:
Kartikaya Gupta
2015-08-28 17:22:17 -04:00
parent 4eff4b6bd7
commit f01f76c98f
7 changed files with 94 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mobile/android/base/TextSelectionHandle.java
View File

@@ -125,28 +125,24 @@ class TextSelectionHandle extends ImageView implements View.OnTouchListener {
}
private void move(float newX, float newY) {
LayerView layerView = GeckoAppShell.getLayerView();
// newX and newY are in screen coordinates, but mLeft/mTop are relative
// to the ancestor (which is what LayerView is relative to also). So,
// we need to adjust them newX/newY. The |ancestorOrigin| variable computed
// we need to adjust newX/newY. The |ancestorOrigin| variable computed
// below is the origin of the ancestor relative to the screen coordinates,
// so subtracting that from newY puts newY into the desired coordinate
// space. We also need to include the offset amount of the touch location
// relative to the top left of the handle (mTouchStart).
float layerViewTranslation = GeckoAppShell.getLayerView().getSurfaceTranslation();
int[] layerViewPosition = new int[2];
GeckoAppShell.getLayerView().getLocationOnScreen(layerViewPosition);
float ancestorOrigin = layerViewPosition[1] - layerViewTranslation;
layerView.getLocationOnScreen(layerViewPosition);
float ancestorOrigin = layerViewPosition[1];
mLeft = newX - mTouchStart.x;
mTop = newY - mTouchStart.y - ancestorOrigin;
LayerView layerView = GeckoAppShell.getLayerView();
if (layerView == null) {
Log.e(LOGTAG, "Can't move selection because layerView is null");
return;
}
// Send x coordinate on the right side of the start handle, left side of the end handle.
float layerViewTranslation = layerView.getSurfaceTranslation();
PointF geckoPoint = new PointF(mLeft + adjustLeftForHandle(),
mTop - layerViewTranslation);
geckoPoint = layerView.convertViewPointToLayerPoint(geckoPoint);