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

Improve Android zone restoration

Browse Source
This commit is contained in:
friarsol
2020-02-13 23:17:26 -05:00
parent ddc531c5f2
commit ec79434759
3 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
forge-gui-mobile/src/forge/screens/match/MatchController.java
View File

@@ -322,8 +322,9 @@ public class MatchController extends AbstractGuiGame {
final VPlayerPanel playerPanel = view.getPlayerPanel(player); final VPlayerPanel playerPanel = view.getPlayerPanel(player);
playersWithTargetables.put(player, playerPanel.getSelectedTab()); //backup selected tab before changing it playersWithTargetables.put(player, playerPanel.getSelectedTab()); //backup selected tab before changing it
final InfoTab zoneTab = playerPanel.getZoneTab(zoneType); final InfoTab zoneTab = playerPanel.getZoneTab(zoneType);
ZoneType previousZone = playerPanel.getZoneByInfoTab(playerPanel.getSelectedTab());
updates.add(new PlayerZoneUpdate(player, previousZone));
if (zoneTab != null) { if (zoneTab != null) {
updates.add(new PlayerZoneUpdate(player, zoneType));
playerPanel.setSelectedTab(zoneTab); playerPanel.setSelectedTab(zoneTab);
} }
} }
@@ -343,9 +344,12 @@ public class MatchController extends AbstractGuiGame {
break; break;
} }
if (zone == null) { return; }
final VPlayerPanel playerPanel = view.getPlayerPanel(player); final VPlayerPanel playerPanel = view.getPlayerPanel(player);
if (zone == null) {
playerPanel.hideSelectedTab();
continue;
}
final InfoTab zoneTab = playerPanel.getZoneTab(zone); final InfoTab zoneTab = playerPanel.getZoneTab(zone);
playerPanel.setSelectedTab(zoneTab); playerPanel.setSelectedTab(zoneTab);
} }

20
forge-gui-mobile/src/forge/screens/match/views/VPlayerPanel.java
View File

@@ -102,18 +102,32 @@ public class VPlayerPanel extends FContainer {
return zoneTabs.get(zoneType); return zoneTabs.get(zoneType);
} }
public ZoneType getZoneByInfoTab(InfoTab tab) {
for(ZoneType zone : zoneTabs.keySet()) {
if (zoneTabs.get(zone).equals(tab)) {
return zone;
}
}
return null;
}
public void setSelectedZone(ZoneType zoneType) { public void setSelectedZone(ZoneType zoneType) {
setSelectedTab(zoneTabs.get(zoneType)); setSelectedTab(zoneTabs.get(zoneType));
} }
public void hideSelectedTab() {
if (selectedTab != null) {
selectedTab.displayArea.setVisible(false);
}
}
public void setSelectedTab(InfoTab selectedTab0) { public void setSelectedTab(InfoTab selectedTab0) {
if (selectedTab == selectedTab0) { if (selectedTab == selectedTab0) {
return; return;
} }
if (selectedTab != null) { hideSelectedTab();
selectedTab.displayArea.setVisible(false);
}
selectedTab = selectedTab0; selectedTab = selectedTab0;

12
forge-gui/src/main/java/forge/player/PlayerZoneUpdate.java
View File

@@ -14,11 +14,15 @@ public class PlayerZoneUpdate implements Serializable {
private final Set<ZoneType> zones; private final Set<ZoneType> zones;
public PlayerZoneUpdate(final PlayerView player, final ZoneType zone) { public PlayerZoneUpdate(final PlayerView player, final ZoneType zone) {
if (player == null || zone == null) { if (player == null ) {
throw new NullPointerException(); throw new NullPointerException();
} }
this.player = player; this.player = player;
this.zones = EnumSet.of(zone); if (zone != null) {
this.zones = EnumSet.of(zone);
} else {
this.zones = EnumSet.noneOf(ZoneType.class);
}
} }
public PlayerView getPlayer() { public PlayerView getPlayer() {
@@ -30,13 +34,13 @@ public class PlayerZoneUpdate implements Serializable {
void addZone(final ZoneType zone) { void addZone(final ZoneType zone) {
if (zone == null) { if (zone == null) {
throw new NullPointerException(); return;
} }
zones.add(zone); zones.add(zone);
} }
void add(final PlayerZoneUpdate other) { void add(final PlayerZoneUpdate other) {
if (other == null) { if (other == null) {
throw new NullPointerException(); return;
} }
zones.addAll(other.getZones()); zones.addAll(other.getZones());
} }