external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 03:38:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
Outlinedtext for better visibility when animating life gained/loss

See merge request core-developers/forge!5448
This commit is contained in:
Anthony Calosa
2021-09-27 04:05:36 +00:00
parent 53162d45da 939779e847
commit 73995fbde6
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-gui-mobile/src/forge/screens/match/views/VAvatar.java
View File

@@ -62,7 +62,7 @@ public class VAvatar extends FDisplayObject {
drawPlayerIndicator(g, w, h, percentage); drawPlayerIndicator(g, w, h, percentage);
g.setAlphaComposite(fade); g.setAlphaComposite(fade);
g.drawRect(w / 12f, Color.WHITE, 0, 0, w, h); 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); g.setAlphaComposite(oldAlpha);
} else if (amount < 0) { } else if (amount < 0) {
if (splatter == null) { if (splatter == null) {
@@ -77,7 +77,7 @@ public class VAvatar extends FDisplayObject {
} }
drawPlayerIndicator(g, w, h, percentage); drawPlayerIndicator(g, w, h, percentage);
g.setAlphaComposite(fade); 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); g.setAlphaComposite(oldAlpha);
} }
} }

2
forge-gui-mobile/src/forge/toolbox/FCardPanel.java
View File

@@ -176,7 +176,7 @@ public class FCardPanel extends FDisplayObject {
percentage = 1; percentage = 1;
progress = 0; progress = 0;
} }
float mod = (w/3f)*percentage; float mod = w*percentage;
float oldAlpha = g.getfloatAlphaComposite(); float oldAlpha = g.getfloatAlphaComposite();
if (tapped) { if (tapped) {
g.startRotateTransform(x + edgeOffset, y + h - edgeOffset, getTappedAngle()); g.startRotateTransform(x + edgeOffset, y + h - edgeOffset, getTappedAngle());