Prevent mana pool zooming

This commit is contained in:
drdev
2014-05-17 20:47:20 +00:00
parent 3d32f868a1
commit 1baf8009b0
2 changed files with 8 additions and 0 deletions

View File

@@ -17,6 +17,7 @@ import forge.screens.match.views.VAvatar;
import forge.screens.match.views.VDevMenu; import forge.screens.match.views.VDevMenu;
import forge.screens.match.views.VGameMenu; import forge.screens.match.views.VGameMenu;
import forge.screens.match.views.VLog; import forge.screens.match.views.VLog;
import forge.screens.match.views.VManaPool;
import forge.screens.match.views.VPlayerPanel; import forge.screens.match.views.VPlayerPanel;
import forge.screens.match.views.VPlayerPanel.InfoTab; import forge.screens.match.views.VPlayerPanel.InfoTab;
import forge.screens.match.views.VPlayers; import forge.screens.match.views.VPlayers;
@@ -280,6 +281,9 @@ public class MatchScreen extends FScreen {
backupHorzScrollPane(playerPanel.getField().getRow1(), x, horzScrollPanes); backupHorzScrollPane(playerPanel.getField().getRow1(), x, horzScrollPanes);
backupHorzScrollPane(playerPanel.getField().getRow2(), x, horzScrollPanes); backupHorzScrollPane(playerPanel.getField().getRow2(), x, horzScrollPanes);
for (InfoTab tab : playerPanel.getTabs()) { for (InfoTab tab : playerPanel.getTabs()) {
if (tab.getDisplayArea() instanceof VManaPool) {
continue; //don't include Mana pool in this
}
backupHorzScrollPane(tab.getDisplayArea(), x, horzScrollPanes); backupHorzScrollPane(tab.getDisplayArea(), x, horzScrollPanes);
} }
} }

View File

@@ -106,6 +106,10 @@ public class VManaPool extends VDisplayArea {
h /= 2; h /= 2;
} }
float w = image.getWidth() * h / image.getHeight(); float w = image.getWidth() * h / image.getHeight();
while (w > getWidth()) {
h /= 2;
w = image.getWidth() * h / image.getHeight();
}
float x = (getWidth() - w) / 2; float x = (getWidth() - w) / 2;
float y = gapY + (maxImageHeight - h) / 2; float y = gapY + (maxImageHeight - h) / 2;