empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Adds additional padding to the bottom of the line so the following line wouldn't overlap the previous line.

Browse source 
Fixes a bug [reported by Salt505 in the beta forum](https://community.signalusers.org/t/beta-feedback-for-the-upcoming-android-5-26-release/38629/163).
This commit is contained in:
Fumiaki Yoshimatsu 2021-12-04 10:00:22 -05:00 • committed by Cody Henthorne
parent 5612a5d9e4
commit 47760867d5
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
image-editor/lib/src/main/java/org/signal/imageeditor/core/renderers/MultiLineTextRenderer.java
View file

@ -173,8 +173,8 @@ public final class MultiLineTextRenderer extends InvalidateableRenderer implemen
}
private class Line {
private final Matrix accentMatrix = new Matrix();
private final Matrix decentMatrix = new Matrix();
private final Matrix ascentMatrix = new Matrix();
private final Matrix descentMatrix = new Matrix();
private final Matrix projectionMatrix = new Matrix();
private final Matrix inverseProjectionMatrix = new Matrix();
private final RectF selectionBounds = new RectF();
@ -252,8 +252,8 @@ public final class MultiLineTextRenderer extends InvalidateableRenderer implemen
projectionMatrix.preTranslate(-textBounds.centerX(), 0);
projectionMatrix.invert(inverseProjectionMatrix);
accentMatrix.setTranslate(0, -ascentInBounds);
decentMatrix.setTranslate(0, descentInBounds);
ascentMatrix.setTranslate(0, -ascentInBounds);
descentMatrix.setTranslate(0, descentInBounds + HIGHLIGHT_TOP_PADDING + HIGHLIGHT_BOTTOM_PADDING);
invalidate();
}
@ -310,7 +310,7 @@ public final class MultiLineTextRenderer extends InvalidateableRenderer implemen
public void render(@NonNull RendererContext rendererContext) {
// add our ascent for ourselves and the next lines
rendererContext.canvasMatrix.concat(accentMatrix);
rendererContext.canvasMatrix.concat(ascentMatrix);
rendererContext.save();
@ -321,7 +321,6 @@ public final class MultiLineTextRenderer extends InvalidateableRenderer implemen
selectionBounds.top - HIGHLIGHT_TOP_PADDING,
textBounds.right + HIGHLIGHT_HORIZONTAL_PADDING,
selectionBounds.bottom + HIGHLIGHT_BOTTOM_PADDING);
int alpha = modePaint.getAlpha();
modePaint.setAlpha(rendererContext.getAlpha(alpha));
rendererContext.canvas.drawRoundRect(modeBounds, HIGHLIGHT_CORNER_RADIUS, HIGHLIGHT_CORNER_RADIUS, modePaint);
@ -367,7 +366,7 @@ public final class MultiLineTextRenderer extends InvalidateableRenderer implemen
rendererContext.restore();
// add our descent for the next lines
rendererContext.canvasMatrix.concat(decentMatrix);
rendererContext.canvasMatrix.concat(descentMatrix);
}
void setSelection(int selStart, int selEnd) {