Support switching and hiding zones

forge-m-base/src/forge/screens/match/views/VPlayerPanel.java

@@ -59,15 +59,23 @@ public class VPlayerPanel extends FContainer {
     }
 
     public void setSelectedZone(ZoneType zoneType) {
-        for (VZoneDisplay zone : zones) {
+        if (selectedZone != null) {
-            if (zone.getZoneType() == zoneType) {
+            if (selectedZone.getZoneType() == zoneType) {
-                if (selectedZone != null) {
-                    selectedZone.setVisible(false);
-                }
-                selectedZone = zone;
-                selectedZone.setVisible(true);
                 return;
             }
+            selectedZone.setVisible(false);
+        }
+        if (zoneType == null) {
+            selectedZone = null;
+        }
+        else {
+            for (VZoneDisplay zone : zones) {
+                if (zone.getZoneType() == zoneType) {
+                    selectedZone = zone;
+                    selectedZone.setVisible(true);
+                    return;
+                }
+            }
         }
     }
 
@@ -171,6 +179,17 @@ public class VPlayerPanel extends FContainer {
             value = "99";
         }
 
+        @Override
+        public boolean tap(float x, float y, int count) {
+            if (selectedZone == zoneToOpen) {
+                setSelectedZone(null);
+            }
+            else {
+                setSelectedZone(zoneToOpen.getZoneType());
+            }
+            return true;
+        }
+
         @Override
         public float getPreferredWidth() {
             return VAvatar.HEIGHT * 1.05f;