From 939779e84782182143cf150f8609b345506537c4 Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Mon, 27 Sep 2021 12:04:25 +0800 Subject: [PATCH] Outlinedtext for better visibility when animating life gained/loss --- forge-gui-mobile/src/forge/screens/match/views/VAvatar.java | 4 ++-- forge-gui-mobile/src/forge/toolbox/FCardPanel.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/forge-gui-mobile/src/forge/screens/match/views/VAvatar.java b/forge-gui-mobile/src/forge/screens/match/views/VAvatar.java index b0bd5873057..0248b00eb78 100644 --- a/forge-gui-mobile/src/forge/screens/match/views/VAvatar.java +++ b/forge-gui-mobile/src/forge/screens/match/views/VAvatar.java @@ -62,7 +62,7 @@ public class VAvatar extends FDisplayObject { drawPlayerIndicator(g, w, h, percentage); g.setAlphaComposite(fade); g.drawRect(w / 12f, Color.WHITE, 0, 0, w, h); - g.drawText("+"+amount, Forge.altZoneTabs ? LIFE_FONT_ALT : LIFE_FONT, Color.WHITE, 0, (getHeight()/2)*fade, getWidth(), getHeight(), false, Align.center, true); + g.drawOutlinedText("+"+amount, Forge.altZoneTabs ? LIFE_FONT_ALT : LIFE_FONT, Color.WHITE, Color.SKY, 0, (getHeight()/2)*fade, getWidth(), getHeight(), false, Align.center, true); g.setAlphaComposite(oldAlpha); } else if (amount < 0) { if (splatter == null) { @@ -77,7 +77,7 @@ public class VAvatar extends FDisplayObject { } drawPlayerIndicator(g, w, h, percentage); g.setAlphaComposite(fade); - g.drawText(String.valueOf(amount), Forge.altZoneTabs ? LIFE_FONT_ALT : LIFE_FONT, Color.RED, 0, (getHeight()/2)*fade, getWidth(), getHeight(), false, Align.center, true); + g.drawOutlinedText(String.valueOf(amount), Forge.altZoneTabs ? LIFE_FONT_ALT : LIFE_FONT, Color.RED, Color.ORANGE, 0, (getHeight()/2)*fade, getWidth(), getHeight(), false, Align.center, true); g.setAlphaComposite(oldAlpha); } } diff --git a/forge-gui-mobile/src/forge/toolbox/FCardPanel.java b/forge-gui-mobile/src/forge/toolbox/FCardPanel.java index 518d60de14b..1cc86190639 100644 --- a/forge-gui-mobile/src/forge/toolbox/FCardPanel.java +++ b/forge-gui-mobile/src/forge/toolbox/FCardPanel.java @@ -176,7 +176,7 @@ public class FCardPanel extends FDisplayObject { percentage = 1; progress = 0; } - float mod = (w/3f)*percentage; + float mod = w*percentage; float oldAlpha = g.getfloatAlphaComposite(); if (tapped) { g.startRotateTransform(x + edgeOffset, y + h - edgeOffset, getTappedAngle());