From 34c2552b56c3196a75b30d03bd1be33a73e7e574 Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Sun, 24 May 2015 22:36:03 +0000
Subject: [PATCH] Fix updating of revealed card in hand

---
 .../screens/match/views/VZoneDisplay.java     | 69 +++++++++++--------
 1 file changed, 41 insertions(+), 28 deletions(-)

diff --git a/forge-gui-mobile/src/forge/screens/match/views/VZoneDisplay.java b/forge-gui-mobile/src/forge/screens/match/views/VZoneDisplay.java
index 610b39db3dc..381b73de1a1 100644
--- a/forge-gui-mobile/src/forge/screens/match/views/VZoneDisplay.java
+++ b/forge-gui-mobile/src/forge/screens/match/views/VZoneDisplay.java
@@ -33,7 +33,19 @@ public class VZoneDisplay extends VCardDisplayArea {
         super.buildTouchListeners(screenX, screenY, listeners);
 
         if (revealedPanel != null) {
-            updateRevealedPanel(screenToLocalX(screenX), screenToLocalY(screenY));
+            float x = screenToLocalX(screenX);
+            float y = screenToLocalY(screenY);
+            if (revealedPanel.contains(x, y)) { return; }
+
+            int idx = cardPanels.size() - 1;
+            for (int i = getChildCount() - 2; i >= 0; i--) {
+                final FDisplayObject cardPanel = getChildAt(i);
+                if (cardPanel.contains(x, y)) {
+                    idx = cardPanels.indexOf(cardPanel);
+                    break;
+                }
+            }
+            setRevealedPanel(idx);
         }
     }
 
@@ -42,42 +54,43 @@ public class VZoneDisplay extends VCardDisplayArea {
         if (revealedPanel == null) { //if no overlapping panels, just pan scroll as normal
             return super.pan(x, y, deltaX, deltaY, moreVertical);
         }
-        updateRevealedPanel(x, y);
-        return true;
-    }
-
-    private void updateRevealedPanel(float x, float y) {
-        if (revealedPanel.contains(x, y)) { return; }
-
-        int idx = -1;
-        for (int i = getChildCount() - 2; i >= 0; i--) {
-            final FDisplayObject cardPanel = getChildAt(i);
-            if (cardPanel.contains(x, y)) {
-                idx = cardPanels.indexOf(cardPanel);
+        int idx = cardPanels.size() - 1;
+        for (int i = idx - 1; i >= 0; i--) {
+            if (cardPanels.get(i).contains(x, y)) {
+                idx = i;
                 break;
             }
         }
-        if (idx >= 0) {
-            setRevealedPanel(idx);
-        }
+        setRevealedPanel(idx);
+        return true;
     }
 
     private void setRevealedPanel(int idx) {
-        //cascade cards back from revealed panel
+        revealedPanel = cardPanels.get(idx);
         clearChildren();
-        int maxIdx = cardPanels.size() - 1;
-        int offset = Math.max(idx, maxIdx - idx);
-        for (int i = offset; i > 0; i--) {
-            int idx1 = idx - i;
-            int idx2 = idx + i;
-            if (idx1 >= 0) {
-                add(cardPanels.get(idx1));
-            }
-            if (idx2 <= maxIdx) {
-                add(cardPanels.get(idx2));
+        if (Forge.isLandscapeMode()) {
+            //for landscape mode, just show revealed card on top
+            for (CardAreaPanel cardPanel : cardPanels) {
+                if (cardPanel != revealedPanel) {
+                    add(cardPanel);
+                }
+            }
+        }
+        else {
+            //for portrait mode, cascade cards back from revealed panel
+            int maxIdx = cardPanels.size() - 1;
+            int offset = Math.max(idx, maxIdx - idx);
+            for (int i = offset; i > 0; i--) {
+                int idx1 = idx - i;
+                int idx2 = idx + i;
+                if (idx1 >= 0) {
+                    add(cardPanels.get(idx1));
+                }
+                if (idx2 <= maxIdx) {
+                    add(cardPanels.get(idx2));
+                }
             }
         }
-        revealedPanel = cardPanels.get(idx);
         add(revealedPanel);
     }