From c3917bb40d2290a539c510e60d02b54162d6dc74 Mon Sep 17 00:00:00 2001 From: Olga Miller Date: Sat, 11 Mar 2017 21:07:24 +0100 Subject: [PATCH] Moved the outline inset to getBounds (where float rectangle is used) and enlarged the inset (Because e.g. "k" in "Droid Sans Mono" has very sharp corners, which were outside the active text shadow) --- .../java/om/sstvencoder/TextOverlay/LabelPainter.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/om/sstvencoder/TextOverlay/LabelPainter.java b/app/src/main/java/om/sstvencoder/TextOverlay/LabelPainter.java index bd474bd..03400e0 100644 --- a/app/src/main/java/om/sstvencoder/TextOverlay/LabelPainter.java +++ b/app/src/main/java/om/sstvencoder/TextOverlay/LabelPainter.java @@ -95,6 +95,10 @@ class LabelPainter { public RectF getBounds() { RectF bounds = new RectF(getTextBounds()); bounds.offset(mX, mY); + if (mLabel.getOutline()) { + float inset = mLabel.getOutlineSize() * mPaint.getTextSize(); + bounds.inset(-inset, -inset); + } return bounds; } @@ -113,10 +117,6 @@ class LabelPainter { Rect bounds = new Rect(); String text = mLabel.getText(); mPaint.getTextBounds(text, 0, text.length(), bounds); - if (mLabel.getOutline()) { - int dxOutline = (int) (mLabel.getOutlineSize() * mPaint.getTextSize()) / 2; - bounds.inset(-dxOutline, -dxOutline); - } return bounds; }