From 8aaa61a04478b1f3f7b94023a01a9982d63e227a Mon Sep 17 00:00:00 2001 From: drdev Date: Sun, 11 May 2014 20:26:08 +0000 Subject: [PATCH] Flip info tab image and label for top panel --- .../screens/match/views/VPlayerPanel.java | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/forge-gui-mobile/src/forge/screens/match/views/VPlayerPanel.java b/forge-gui-mobile/src/forge/screens/match/views/VPlayerPanel.java index 607b77c4740..b4a6993eaab 100644 --- a/forge-gui-mobile/src/forge/screens/match/views/VPlayerPanel.java +++ b/forge-gui-mobile/src/forge/screens/match/views/VPlayerPanel.java @@ -245,13 +245,14 @@ public class VPlayerPanel extends FContainer { @Override public void draw(Graphics g) { float x, y, w, h; + boolean flipped = isFlipped(); if (selectedTab == this) { y = 0; w = getWidth(); h = getHeight(); float yAcross; - if (isFlipped()) { + if (flipped) { y += INFO_TAB_PADDING_Y; yAcross = y; y--; @@ -294,11 +295,24 @@ public class VPlayerPanel extends FContainer { } h = icon.getHeight() * w / icon.getWidth(); x = (getWidth() - w) / 2; - y = INFO_TAB_PADDING_Y; + if (flipped) { + y = getHeight() - h - INFO_TAB_PADDING_Y; + } + else { + y = INFO_TAB_PADDING_Y; + } g.drawImage(icon, x, y, w, h); - y += h + INFO_TAB_PADDING_Y; - g.drawText(value, INFO_FONT, INFO_FORE_COLOR, 0, y, getWidth(), getHeight() - y + 1, false, HAlignment.CENTER, false); + 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; + h = getHeight() - y + 1; + } + g.drawText(value, INFO_FONT, INFO_FORE_COLOR, 0, y, getWidth(), h, false, HAlignment.CENTER, false); } } }