- Ensure that players have equal player panel heights in a two-player game in Landscape mode

This commit is contained in:
Agetian
2018-04-10 10:56:33 +03:00
parent 7e58e204ed
commit 9a43c1b3ae

View File

@@ -544,27 +544,36 @@ public class MatchScreen extends FScreen {
}
float playerCount = getPlayerPanels().keySet().size();
//determine player panel heights based on visibility of zone displays
if (Forge.isLandscapeMode() && playerCount == 2) {
// Ensure that players have equal player panel heights in two player Forge in Landscape mode
float topPlayerPanelHeight = totalHeight / 2;
float bottomPlayerPanelHeight = topPlayerPanelHeight;
topPlayerPanel.setBounds(0, 0, visibleWidth, topPlayerPanelHeight);
bottomPlayerPanel.setBounds(0, totalHeight - bottomPlayerPanelHeight, visibleWidth, bottomPlayerPanelHeight);
} else {
// Determine player panel heights based on visibility of zone displays
float cardRowsHeight = totalHeight - playerCount * avatarHeight;
float totalCardRows = 0;
for (VPlayerPanel playerPanel : playerPanelsList){
if (playerPanel.getSelectedTab() != null){
for (VPlayerPanel playerPanel : playerPanelsList) {
if (playerPanel.getSelectedTab() != null) {
totalCardRows += 1;
}
totalCardRows += 2;
}
float y = 0;
for (VPlayerPanel playerPanel : playerPanelsList){
for (VPlayerPanel playerPanel : playerPanelsList) {
float panelHeight;
if (playerPanel.getSelectedTab() != null) {
panelHeight = cardRowsHeight * 3f / totalCardRows;
} else{
} else {
panelHeight = cardRowsHeight * 2f / totalCardRows;
}
panelHeight += avatarHeight;
playerPanel.setBounds(0, y, visibleWidth, panelHeight);
y += panelHeight;
}
}
return new ScrollBounds(visibleWidth, totalHeight);
}