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

Support tinting card detail boxes

Browse Source
This commit is contained in:
drdev
2014-04-19 23:19:23 +00:00
parent b758129933
commit b5c10f7acd
2 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
forge-gui-mobile/src/forge/assets/FSkinColor.java
View File

@@ -216,6 +216,13 @@ public class FSkinColor {
return isColorBright(c) ? Color.BLACK : Color.WHITE; return isColorBright(c) ? Color.BLACK : Color.WHITE;
} }
public static Color tintColor(Color source, Color tint, float alpha) {
float r = (tint.r - source.r) * alpha + source.r;
float g = (tint.g - source.g) * alpha + source.g;
float b = (tint.b - source.b) * alpha + source.b;
return new Color(r, g, b, 1f);
}
public static Color fromRGB(int r, int g, int b) { public static Color fromRGB(int r, int g, int b) {
return new Color((float)r / 255f, (float)g / 255f, (float)b / 255f, 1f); return new Color((float)r / 255f, (float)g / 255f, (float)b / 255f, 1f);
} }

28
forge-gui-mobile/src/forge/screens/match/InputSelectCard.java
View File

@@ -177,6 +177,9 @@ public class InputSelectCard {
private static final FSkinFont TEXT_FONT = TYPE_FONT; private static final FSkinFont TEXT_FONT = TYPE_FONT;
private static final FSkinFont ID_FONT = TEXT_FONT; private static final FSkinFont ID_FONT = TEXT_FONT;
private static final FSkinFont PT_FONT = NAME_FONT; private static final FSkinFont PT_FONT = NAME_FONT;
private static final float NAME_BOX_TINT = 0.2f;
private static final float TEXT_BOX_TINT = 0.1f;
private static final float PT_BOX_TINT = 0.2f;
private static final float MANA_COST_PADDING = 3; private static final float MANA_COST_PADDING = 3;
private static final float SET_BOX_MARGIN = 1; private static final float SET_BOX_MARGIN = 1;
private static final float MANA_SYMBOL_SIZE = FSkinImage.MANA_1.getNearestHQWidth(2 * (NAME_FONT.getFont().getCapHeight() - MANA_COST_PADDING)); private static final float MANA_SYMBOL_SIZE = FSkinImage.MANA_1.getNearestHQWidth(2 * (NAME_FONT.getFont().getCapHeight() - MANA_COST_PADDING));
@@ -499,12 +502,9 @@ public class InputSelectCard {
h = Math.max(MANA_SYMBOL_SIZE + 2 * MANA_COST_PADDING, 2 * NAME_FONT.getFont().getCapHeight()) + 2 * TYPE_FONT.getFont().getCapHeight() + 2; h = Math.max(MANA_SYMBOL_SIZE + 2 * MANA_COST_PADDING, 2 * NAME_FONT.getFont().getCapHeight()) + 2 * TYPE_FONT.getFont().getCapHeight() + 2;
//draw name/type box //draw name/type box
int nameManaCostStep = 100; //TODO: add better background colors to CardBorderColor enum Color nameBoxColor1 = FSkinColor.tintColor(Color.WHITE, color1, NAME_BOX_TINT);
color1 = FSkinColor.stepColor(color1, nameManaCostStep); Color nameBoxColor2 = color2 == null ? null : FSkinColor.tintColor(Color.WHITE, color2, NAME_BOX_TINT);
if (color2 != null) { drawCardNameBox(g, card, nameBoxColor1, nameBoxColor2, x, y, w, h);
color2 = FSkinColor.stepColor(color2, nameManaCostStep);
}
drawCardNameBox(g, card, color1, color2, x, y, w, h);
float ptBoxHeight = 2 * PT_FONT.getFont().getCapHeight(); float ptBoxHeight = 2 * PT_FONT.getFont().getCapHeight();
@@ -512,11 +512,16 @@ public class InputSelectCard {
y += h + innerBorderThickness; y += h + innerBorderThickness;
h = height - FDialog.INSETS - blackBorderThickness - ptBoxHeight - 2 * innerBorderThickness - y; h = height - FDialog.INSETS - blackBorderThickness - ptBoxHeight - 2 * innerBorderThickness - y;
drawCardTextBox(g, card, canShow, color1, color2, x, y, w, h); Color textBoxColor1 = FSkinColor.tintColor(Color.WHITE, color1, TEXT_BOX_TINT);
Color textBoxColor2 = color2 == null ? null : FSkinColor.tintColor(Color.WHITE, color2, TEXT_BOX_TINT);
drawCardTextBox(g, card, canShow, textBoxColor1, textBoxColor2, x, y, w, h);
y += h + innerBorderThickness; y += h + innerBorderThickness;
h = ptBoxHeight; h = ptBoxHeight;
drawCardIdAndPtBox(g, card, idForeColor, color1, color2, x, y, w, h);
Color ptColor1 = FSkinColor.tintColor(Color.WHITE, color1, PT_BOX_TINT);
Color ptColor2 = color2 == null ? null : FSkinColor.tintColor(Color.WHITE, color2, PT_BOX_TINT);
drawCardIdAndPtBox(g, card, idForeColor, ptColor1, ptColor2, x, y, w, h);
} }
private static void drawCardNameBox(Graphics g, Card card, Color color1, Color color2, float x, float y, float w, float h) { private static void drawCardNameBox(Graphics g, Card card, Color color1, Color color2, float x, float y, float w, float h) {
@@ -579,7 +584,12 @@ public class InputSelectCard {
} }
private static void drawCardTextBox(Graphics g, Card card, boolean canShow, Color color1, Color color2, float x, float y, float w, float h) { private static void drawCardTextBox(Graphics g, Card card, boolean canShow, Color color1, Color color2, float x, float y, float w, float h) {
g.fillRect(Color.WHITE, x, y, w, h); if (color2 == null) {
g.fillRect(color1, x, y, w, h);
}
else {
g.fillGradientRect(color1, color2, false, x, y, w, h);
}
g.drawRect(1, Color.BLACK, x, y, w, h); g.drawRect(1, Color.BLACK, x, y, w, h);
float padX = TEXT_FONT.getFont().getCapHeight() / 2; float padX = TEXT_FONT.getFont().getCapHeight() / 2;