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

Rotate Plane/Phenomenon on FOptionPane

Browse Source
This commit is contained in:
kevlahnota
2017-09-14 22:47:56 +00:00
parent 426fe0fe40
commit e8e23603c3
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
forge-gui-mobile/src/forge/card/CardRenderer.java
View File

@@ -31,6 +31,7 @@ import forge.item.PaperCard;
import forge.model.FModel; import forge.model.FModel;
import forge.properties.ForgeConstants; import forge.properties.ForgeConstants;
import forge.properties.ForgeConstants.CounterDisplayType; import forge.properties.ForgeConstants.CounterDisplayType;
import forge.properties.ForgePreferences;
import forge.properties.ForgePreferences.FPref; import forge.properties.ForgePreferences.FPref;
import forge.screens.match.MatchController; import forge.screens.match.MatchController;
import forge.toolbox.FList; import forge.toolbox.FList;
@@ -362,14 +363,23 @@ public class CardRenderer {
} }
} }
public static void drawCard(Graphics g, CardView card, float x, float y, float w, float h, CardStackPosition pos) { public static void drawCard(Graphics g, CardView card, float x, float y, float w, float h, CardStackPosition pos, boolean rotate) {
ForgePreferences prefs = new ForgePreferences();
//rotate plane or phenomenon...
boolean rotateDisplay = prefs != null
&& prefs.getPrefBoolean(ForgePreferences.FPref.UI_ROTATE_PLANE_OR_PHENOMENON)
&& (card.getCurrentState().isPhenomenon() || card.getCurrentState().isPlane());
Texture image = ImageCache.getImage(card); Texture image = ImageCache.getImage(card);
if (image != null) { if (image != null) {
if (image == ImageCache.defaultImage) { if (image == ImageCache.defaultImage) {
CardImageRenderer.drawCardImage(g, card, false, x, y, w, h, pos); CardImageRenderer.drawCardImage(g, card, false, x, y, w, h, pos);
} }
else { else {
g.drawImage(image, x, y, w, h); if(rotateDisplay && rotate)
g.drawRotatedImage(image, x, y, w, h, x + w / 2, y + h / 2, -90);
else
g.drawImage(image, x, y, w, h);
} }
drawFoilEffect(g, card, x, y, w, h); drawFoilEffect(g, card, x, y, w, h);
} }
@@ -379,7 +389,7 @@ public class CardRenderer {
} }
public static void drawCardWithOverlays(Graphics g, CardView card, float x, float y, float w, float h, CardStackPosition pos) { public static void drawCardWithOverlays(Graphics g, CardView card, float x, float y, float w, float h, CardStackPosition pos) {
drawCard(g, card, x, y, w, h, pos); drawCard(g, card, x, y, w, h, pos, false);
float padding = w * PADDING_MULTIPLIER; //adjust for card border float padding = w * PADDING_MULTIPLIER; //adjust for card border
x += padding; x += padding;

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

@@ -135,7 +135,7 @@ public class FOptionPane extends FDialog {
final float x = (getWidth() - w) / 2; final float x = (getWidth() - w) / 2;
final float y = 0; final float y = 0;
CardRenderer.drawCard(g, card, x, y, w, h, CardStackPosition.Top); CardRenderer.drawCard(g, card, x, y, w, h, CardStackPosition.Top, true);
} }
}; };
cardDisplay.setHeight(Forge.getScreenHeight() / 2); cardDisplay.setHeight(Forge.getScreenHeight() / 2);