From 0543a2a06d7bab1f9d965c48e7ee993b7c18f720 Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Sun, 18 May 2014 12:31:59 +0000
Subject: [PATCH] Prevent cards scrolling off screen after zooming

---
 .../src/forge/screens/match/MatchScreen.java             | 9 ---------
 forge-gui-mobile/src/forge/toolbox/FScrollPane.java      | 8 --------
 2 files changed, 17 deletions(-)

diff --git a/forge-gui-mobile/src/forge/screens/match/MatchScreen.java b/forge-gui-mobile/src/forge/screens/match/MatchScreen.java
index a4228ad8f0c..f1daa790dce 100644
--- a/forge-gui-mobile/src/forge/screens/match/MatchScreen.java
+++ b/forge-gui-mobile/src/forge/screens/match/MatchScreen.java
@@ -255,15 +255,6 @@ public class MatchScreen extends FScreen {
             float yAfter = y * ratio;
             setScrollTop(oldScrollTop + yAfter - y);
 
-            //make scroll panes wide enough to support scrolling cards into view
-            zoom = newScrollHeight / (getHeight() - staticHeight);
-            for (FScrollPane scrollPane : horzScrollPanes.keySet()) {
-                float minScrollWidth = scrollPane.getWidth() * zoom;
-                if (scrollPane.getScrollWidth() < minScrollWidth) {
-                    scrollPane.setScrollWidth(minScrollWidth);
-                }
-            }
-
             //adjust scroll left of all horizontal scroll panes to keep x position the same
             float startX = x;
             for (Entry<FScrollPane, Pair<Float, Float>> entry : horzScrollPanes.entrySet()) {
diff --git a/forge-gui-mobile/src/forge/toolbox/FScrollPane.java b/forge-gui-mobile/src/forge/toolbox/FScrollPane.java
index 46213af1341..47983374705 100644
--- a/forge-gui-mobile/src/forge/toolbox/FScrollPane.java
+++ b/forge-gui-mobile/src/forge/toolbox/FScrollPane.java
@@ -40,18 +40,10 @@ public abstract class FScrollPane extends FContainer {
         return scrollBounds.width;
     }
 
-    public void setScrollWidth(float scrollWidth0) {
-        scrollBounds.width = scrollWidth0;
-    }
-
     public float getScrollHeight() {
         return scrollBounds.height;
     }
 
-    public void setScrollHeight(float scrollHeight0) {
-        scrollBounds.height = scrollHeight0;
-    }
-
     public float getMaxScrollLeft() {
         return getScrollWidth() - getWidth();
     }