Kaydet (Commit) 78551d39 authored tarafından Tomaž Vajngerl's avatar Tomaž Vajngerl

android: Fennec change - move classes from gecko.ui to gecko.gfx

Change-Id: I510e0d601e293ed8e013a0273d5ae0f9be078d8a
üst 417d1f62
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.gecko.ui; package org.mozilla.gecko.gfx;
import android.util.Log; import android.util.Log;
import android.view.View; import android.view.View;
......
...@@ -19,9 +19,6 @@ import org.libreoffice.LOKitShell; ...@@ -19,9 +19,6 @@ import org.libreoffice.LOKitShell;
import org.libreoffice.TileIdentifier; import org.libreoffice.TileIdentifier;
import org.libreoffice.TileProvider; import org.libreoffice.TileProvider;
import org.mozilla.gecko.ZoomConstraints; import org.mozilla.gecko.ZoomConstraints;
import org.mozilla.gecko.ui.PanZoomController;
import org.mozilla.gecko.ui.PanZoomTarget;
import org.mozilla.gecko.ui.SimpleScaleGestureDetector;
import org.mozilla.gecko.util.FloatUtils; import org.mozilla.gecko.util.FloatUtils;
public class GeckoLayerClient implements PanZoomTarget, LayerView.Listener { public class GeckoLayerClient implements PanZoomTarget, LayerView.Listener {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.gecko.ui; package org.mozilla.gecko.gfx;
import android.graphics.PointF; import android.graphics.PointF;
import android.graphics.RectF; import android.graphics.RectF;
...@@ -713,12 +713,12 @@ public class PanZoomController ...@@ -713,12 +713,12 @@ public class PanZoomController
if (viewport.width() > pageRect.width()) if (viewport.width() > pageRect.width())
focusX = 0.0f; focusX = 0.0f;
} }
if (pageRect.height() > 0) { /*if (pageRect.height() > 0) {
float scaleFactor = viewport.height() / pageRect.height(); float scaleFactor = viewport.height() / pageRect.height();
minZoomFactor = Math.max(minZoomFactor, zoomFactor * scaleFactor); minZoomFactor = Math.max(minZoomFactor, zoomFactor * scaleFactor);
if (viewport.height() > pageRect.height()) if (viewport.height() > pageRect.height())
focusY = 0.0f; focusY = 0.0f;
} }*/
maxZoomFactor = Math.max(maxZoomFactor, minZoomFactor); maxZoomFactor = Math.max(maxZoomFactor, minZoomFactor);
......
...@@ -3,12 +3,11 @@ ...@@ -3,12 +3,11 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.gecko.ui; package org.mozilla.gecko.gfx;
import android.graphics.PointF; import android.graphics.PointF;
import org.mozilla.gecko.ZoomConstraints; import org.mozilla.gecko.ZoomConstraints;
import org.mozilla.gecko.gfx.ImmutableViewportMetrics;
public interface PanZoomTarget { public interface PanZoomTarget {
public ImmutableViewportMetrics getViewportMetrics(); public ImmutableViewportMetrics getViewportMetrics();
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.gecko.ui; package org.mozilla.gecko.gfx;
import android.graphics.PointF; import android.graphics.PointF;
import android.util.Log; import android.util.Log;
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
package org.mozilla.gecko.ui; package org.mozilla.gecko.gfx;
import android.graphics.PointF; import android.graphics.PointF;
import android.os.Handler; import android.os.Handler;
......
...@@ -13,8 +13,6 @@ import android.view.GestureDetector; ...@@ -13,8 +13,6 @@ import android.view.GestureDetector;
import android.view.MotionEvent; import android.view.MotionEvent;
import org.mozilla.gecko.OnInterceptTouchListener; import org.mozilla.gecko.OnInterceptTouchListener;
import org.mozilla.gecko.ui.PanZoomController;
import org.mozilla.gecko.ui.SimpleScaleGestureDetector;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.Queue; import java.util.Queue;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment