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

Tweak order of overlays

Browse Source
This commit is contained in:
drdev
2014-05-25 04:44:29 +00:00
parent e6f9d68d8a
commit 1b86b3f2c2
1 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -117,19 +117,37 @@ public class FCardPanel extends FDisplayObject {
private void drawOverlays(Graphics g, float x, float y, float w, float h) {
drawFoilEffect(g, card, x, y, w, h);
boolean needNameAndManaCostOverlays = (w < 200);
if (showCardManaCostOverlay() && needNameAndManaCostOverlays) {
float manaSymbolSize = w / 4;
if (card.isSplitCard() && card.getCurState() == CardCharacteristicName.Original) {
float dy = manaSymbolSize / 2 + Utils.scaleY(5);
drawManaCost(g, card.getRules().getMainPart().getManaCost(), x, y + dy, w, h, manaSymbolSize);
drawManaCost(g, card.getRules().getOtherPart().getManaCost(), x, y - dy, w, h, manaSymbolSize);
float padding = w * 0.021f; //adjust for card border
x += padding;
y += padding;
w -= 2 * padding;
h -= 2 * padding;
DetailColors borderColor = CardDetailUtil.getBorderColor(card, FControl.mayShowCard(card));
Color color = FSkinColor.fromRGB(borderColor.r, borderColor.g, borderColor.b);
color = FSkinColor.tintColor(Color.WHITE, color, CardRenderer.PT_BOX_TINT);
if (w < 200) { //only draw name and mana cost overlays if card is small
if (showCardNameOverlay()) {
g.drawOutlinedText(card.getName(), FSkinFont.get(12), Color.WHITE, Color.BLACK, x, y + padding, w, h * 0.4f, true, HAlignment.LEFT, false);
}
else {
drawManaCost(g, card.getManaCost(), x, y, w, h, manaSymbolSize);
if (showCardManaCostOverlay()) {
float manaSymbolSize = w / 4;
if (card.isSplitCard() && card.getCurState() == CardCharacteristicName.Original) {
float dy = manaSymbolSize / 2 + Utils.scaleY(5);
drawManaCost(g, card.getRules().getMainPart().getManaCost(), x, y + dy, w, h, manaSymbolSize);
drawManaCost(g, card.getRules().getOtherPart().getManaCost(), x, y - dy, w, h, manaSymbolSize);
}
else {
drawManaCost(g, card.getManaCost(), x, y, w, h, manaSymbolSize);
}
}
}
if (showCardIdOverlay()) {
drawIdBox(g, color, x, y, w, h);
}
int number = 0;
for (final Integer i : card.getCounters().values()) {
number += i.intValue();
@@ -182,23 +200,7 @@ public class FCardPanel extends FDisplayObject {
CardFaceSymbols.drawSymbol("sacrifice", g, (x + (w / 2)) - sacSymbolSize / 2, (y + (h / 2)) - sacSymbolSize / 2, otherSymbolsSize, otherSymbolsSize);
}
float padding = w * 0.021f; //adjust for card border
x += padding;
y += padding;
w -= 2 * padding;
h -= 2 * padding;
DetailColors borderColor = CardDetailUtil.getBorderColor(card, FControl.mayShowCard(card));
Color color = FSkinColor.fromRGB(borderColor.r, borderColor.g, borderColor.b);
color = FSkinColor.tintColor(Color.WHITE, color, CardRenderer.PT_BOX_TINT);
if (showCardNameOverlay() && needNameAndManaCostOverlays) {
g.drawOutlinedText(card.getName(), FSkinFont.get(12), Color.WHITE, Color.BLACK, x, y + padding, w, h * 0.4f, true, HAlignment.LEFT, false);
}
if (showCardIdOverlay()) {
drawIdBox(g, color, x, y, w, h);
}
if (showCardPowerOverlay()) {
if (showCardPowerOverlay()) { //make sure card p/t box appears on top
drawPtBox(g, color, x, y, w, h);
}
}