android/source/src/java/org/libreoffice/overlay/DocumentOverlayView.java | 25 ++++------ android/source/src/java/org/mozilla/gecko/gfx/LayerView.java | 4 - 2 files changed, 11 insertions(+), 18 deletions(-)
New commits: commit 08815155cdd63f867cb001a1fb134cfaab53279b Author: Michael Weghorn <[email protected]> AuthorDate: Tue Nov 11 14:11:32 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Wed Nov 12 01:42:46 2025 +0100 android: Drop unused LayerView.getListener Change-Id: If8edb3802aea89b3c3f8f06e831011c7152e8064 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193805 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/android/source/src/java/org/mozilla/gecko/gfx/LayerView.java b/android/source/src/java/org/mozilla/gecko/gfx/LayerView.java index a83d4552f111..6fcb81c4ff9e 100644 --- a/android/source/src/java/org/mozilla/gecko/gfx/LayerView.java +++ b/android/source/src/java/org/mozilla/gecko/gfx/LayerView.java @@ -190,10 +190,6 @@ public class LayerView extends FrameLayout { mListener = listener; } - Listener getListener() { - return mListener; - } - public GLController getGLController() { return mGLController; } commit 3935dca4956b2c055593ccb26ab00dc6893cf7a9 Author: Michael Weghorn <[email protected]> AuthorDate: Tue Nov 11 14:00:24 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Wed Nov 12 01:42:36 2025 +0100 android: Extract DocumentOverlayView helper to reposition Add a helper to deduplicate code retrieving the viewport and calling DocumentOverlayView.repositionWithViewport with the corresponding params. Change-Id: I7fcca351471465c39af5c91bd92201aaeea7a0bb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193804 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/android/source/src/java/org/libreoffice/overlay/DocumentOverlayView.java b/android/source/src/java/org/libreoffice/overlay/DocumentOverlayView.java index a247e2ec41ec..6c25180dbbf8 100644 --- a/android/source/src/java/org/libreoffice/overlay/DocumentOverlayView.java +++ b/android/source/src/java/org/libreoffice/overlay/DocumentOverlayView.java @@ -126,9 +126,7 @@ public class DocumentOverlayView extends View implements View.OnTouchListener { return; } mCursor.mPosition = position; - - ImmutableViewportMetrics metrics = mLayerView.getViewportMetrics(); - repositionWithViewport(metrics.viewportRectLeft, metrics.viewportRectTop, metrics.zoomFactor); + reposition(); } /** @@ -137,9 +135,7 @@ public class DocumentOverlayView extends View implements View.OnTouchListener { */ public void changeSelections(List<RectF> selectionRects) { mSelections = selectionRects; - - ImmutableViewportMetrics metrics = mLayerView.getViewportMetrics(); - repositionWithViewport(metrics.viewportRectLeft, metrics.viewportRectTop, metrics.zoomFactor); + reposition(); } /** @@ -152,9 +148,7 @@ public class DocumentOverlayView extends View implements View.OnTouchListener { } mGraphicSelection.mRectangle = rectangle; - - ImmutableViewportMetrics metrics = mLayerView.getViewportMetrics(); - repositionWithViewport(metrics.viewportRectLeft, metrics.viewportRectTop, metrics.zoomFactor); + reposition(); } public void repositionWithViewport(float x, float y, float zoom) { @@ -189,6 +183,12 @@ public class DocumentOverlayView extends View implements View.OnTouchListener { invalidate(); } + private void reposition() + { + ImmutableViewportMetrics metrics = mLayerView.getViewportMetrics(); + repositionWithViewport(metrics.viewportRectLeft, metrics.viewportRectTop, metrics.zoomFactor); + } + /** * Convert the input rectangle from document to screen coordinates * according to current viewport data (x, y, zoom). @@ -460,9 +460,7 @@ public class DocumentOverlayView extends View implements View.OnTouchListener { } RectUtils.assign(handle.mDocumentPosition, position); - - ImmutableViewportMetrics metrics = mLayerView.getViewportMetrics(); - repositionWithViewport(metrics.viewportRectLeft, metrics.viewportRectTop, metrics.zoomFactor); + reposition(); } /** @@ -523,8 +521,7 @@ public class DocumentOverlayView extends View implements View.OnTouchListener { RectUtils.assign(mCalcSelectionBox.mDocumentPosition, cellCursorRect); mCalcSelectionBox.setVisible(true); - ImmutableViewportMetrics metrics = mLayerView.getViewportMetrics(); - repositionWithViewport(metrics.viewportRectLeft, metrics.viewportRectTop, metrics.zoomFactor); + reposition(); // show selection on headers if (!mCalcHeadersController.pendingRowOrColumnSelectionToShowUp()) {
