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

Revert previous commit

Browse Source
This commit is contained in:
drdev
2014-05-11 20:30:27 +00:00
parent 8aaa61a044
commit 36230e137e
2 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-gui-mobile-dev/src/forge/app/Main.java
View File

@@ -4,9 +4,10 @@ import com.badlogic.gdx.backends.lwjgl.LwjglApplication;
import com.badlogic.gdx.backends.lwjgl.LwjglClipboard; import com.badlogic.gdx.backends.lwjgl.LwjglClipboard;
import forge.Forge; import forge.Forge;
import forge.util.Utils;
public class Main { public class Main {
public static void main(String[] args) { public static void main(String[] args) {
new LwjglApplication(new Forge(new LwjglClipboard(), "../forge-gui/"), "Forge", 320, 480, true); new LwjglApplication(new Forge(new LwjglClipboard(), "../forge-gui/"), "Forge", (int)Utils.BASE_WIDTH, (int)Utils.BASE_HEIGHT, true);
} }
} }

18
forge-gui-mobile/src/forge/screens/match/views/VPlayerPanel.java
View File

@@ -245,14 +245,13 @@ public class VPlayerPanel extends FContainer {
@Override @Override
public void draw(Graphics g) { public void draw(Graphics g) {
float x, y, w, h; float x, y, w, h;
boolean flipped = isFlipped();
if (selectedTab == this) { if (selectedTab == this) {
y = 0; y = 0;
w = getWidth(); w = getWidth();
h = getHeight(); h = getHeight();
float yAcross; float yAcross;
if (flipped) { if (isFlipped()) {
y += INFO_TAB_PADDING_Y; y += INFO_TAB_PADDING_Y;
yAcross = y; yAcross = y;
y--; y--;
@@ -295,24 +294,11 @@ public class VPlayerPanel extends FContainer {
} }
h = icon.getHeight() * w / icon.getWidth(); h = icon.getHeight() * w / icon.getWidth();
x = (getWidth() - w) / 2; x = (getWidth() - w) / 2;
if (flipped) {
y = getHeight() - h - INFO_TAB_PADDING_Y;
}
else {
y = INFO_TAB_PADDING_Y; y = INFO_TAB_PADDING_Y;
}
g.drawImage(icon, x, y, w, h); g.drawImage(icon, x, y, w, h);
if (flipped) {
h = INFO_FONT.getFont().getCapHeight();
y -= h + INFO_TAB_PADDING_Y;
h += INFO_TAB_PADDING_Y;
}
else {
y += h + INFO_TAB_PADDING_Y; y += h + INFO_TAB_PADDING_Y;
h = getHeight() - y + 1; g.drawText(value, INFO_FONT, INFO_FORE_COLOR, 0, y, getWidth(), getHeight() - y + 1, false, HAlignment.CENTER, false);
}
g.drawText(value, INFO_FONT, INFO_FORE_COLOR, 0, y, getWidth(), h, false, HAlignment.CENTER, false);
} }
} }
} }