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

Prevent card overlapping message bars

Browse Source
This commit is contained in:
drdev
2014-12-11 22:22:18 +00:00
parent 16cf2651fb
commit 3ec1e677d8
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
forge-gui-mobile/src/forge/card/CardZoom.java
View File

@@ -178,6 +178,8 @@ public class CardZoom extends FOverlay {
public void drawOverlay(Graphics g) { public void drawOverlay(Graphics g) {
float w = getWidth(); float w = getWidth();
float h = getHeight(); float h = getHeight();
float messageHeight = MSG_FONT.getCapHeight() * 2.5f;
float maxCardHeight = h - 2 * messageHeight;
float cardWidth, cardHeight, y; float cardWidth, cardHeight, y;
if (oneCardView) { if (oneCardView) {
@@ -198,6 +200,10 @@ public class CardZoom extends FOverlay {
cardHeight = FCardPanel.ASPECT_RATIO * cardWidth; cardHeight = FCardPanel.ASPECT_RATIO * cardWidth;
} }
if (cardHeight > maxCardHeight) { //prevent card overlapping message bars
cardHeight = maxCardHeight;
cardWidth = cardHeight / FCardPanel.ASPECT_RATIO;
}
float x = (w - cardWidth) / 2; float x = (w - cardWidth) / 2;
y = (h - cardHeight) / 2; y = (h - cardHeight) / 2;
if (zoomMode) { if (zoomMode) {
@@ -214,7 +220,6 @@ public class CardZoom extends FOverlay {
g.drawImage(FSkinImage.FLIPCARD, flipIconBounds.x, flipIconBounds.y, flipIconBounds.width, flipIconBounds.height); g.drawImage(FSkinImage.FLIPCARD, flipIconBounds.x, flipIconBounds.y, flipIconBounds.width, flipIconBounds.height);
} }
float messageHeight = MSG_FONT.getCapHeight() * 2.5f;
if (currentActivateAction != null) { if (currentActivateAction != null) {
g.fillRect(MSG_BACK_COLOR, 0, 0, w, messageHeight); g.fillRect(MSG_BACK_COLOR, 0, 0, w, messageHeight);
g.drawText("Swipe up to " + currentActivateAction, MSG_FONT, MSG_FORE_COLOR, 0, 0, w, messageHeight, false, HAlignment.CENTER, true); g.drawText("Swipe up to " + currentActivateAction, MSG_FONT, MSG_FORE_COLOR, 0, 0, w, messageHeight, false, HAlignment.CENTER, true);