From 0d46e58dbc9c4abf67f98fdd211d364dd45b187e Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Fri, 25 Jul 2014 05:23:37 +0000
Subject: [PATCH] Prevent being able to scroll options panel

---
 .../src/forge/itemmanager/views/ImageView.java  |  7 ++-----
 .../forge/itemmanager/views/ItemListView.java   |  3 +--
 .../src/forge/itemmanager/views/ItemView.java   | 17 ++++++-----------
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java b/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java
index 01812552570..c1976a6460a 100644
--- a/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java
+++ b/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java
@@ -381,7 +381,7 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
     }
 
     @Override
-    protected float layoutOptionsPanel(float visibleWidth, float height) {
+    protected void layoutOptionsPanel(float width, float height) {
         float padding = ItemFilter.PADDING;
         float x = 0;
         float h = FTextField.getDefaultHeight(ItemFilter.DEFAULT_FONT);
@@ -393,7 +393,7 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
 
         //determine width of combo boxes based on available width versus auto-size widths
         float lblPileByWidth = lblPileBy.getAutoSizeBounds().width;
-        float availableComboBoxWidth = visibleWidth - x - lblPileByWidth - padding;
+        float availableComboBoxWidth = width - x - lblPileByWidth - padding;
         float groupByWidth = availableComboBoxWidth * 0.6f;
         float pileByWidth = availableComboBoxWidth - groupByWidth;
 
@@ -402,9 +402,6 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
         lblPileBy.setBounds(x, y, lblPileByWidth, h);
         x += lblPileByWidth;
         cbPileByOptions.setBounds(x, y, pileByWidth, h);
-        x += pileByWidth + padding;
-
-        return x;
     }
 
     private void updateLayout(boolean forRefresh) {
diff --git a/forge-gui-mobile/src/forge/itemmanager/views/ItemListView.java b/forge-gui-mobile/src/forge/itemmanager/views/ItemListView.java
index f7f7ed81f28..a6880c21113 100644
--- a/forge-gui-mobile/src/forge/itemmanager/views/ItemListView.java
+++ b/forge-gui-mobile/src/forge/itemmanager/views/ItemListView.java
@@ -209,8 +209,7 @@ public final class ItemListView<T extends InventoryItem> extends ItemView<T> {
     }
 
     @Override
-    protected float layoutOptionsPanel(float visibleWidth, float height) {
-        return visibleWidth;
+    protected void layoutOptionsPanel(float width, float height) {
     }
 
     public final class ItemList extends FList<Entry<T, Integer>> {
diff --git a/forge-gui-mobile/src/forge/itemmanager/views/ItemView.java b/forge-gui-mobile/src/forge/itemmanager/views/ItemView.java
index 765c3e96e96..464271b4450 100644
--- a/forge-gui-mobile/src/forge/itemmanager/views/ItemView.java
+++ b/forge-gui-mobile/src/forge/itemmanager/views/ItemView.java
@@ -10,6 +10,7 @@ import forge.itemmanager.ItemColumn;
 import forge.itemmanager.ItemManager;
 import forge.itemmanager.ItemManagerConfig;
 import forge.itemmanager.ItemManagerModel;
+import forge.toolbox.FContainer;
 import forge.toolbox.FEvent;
 import forge.toolbox.FEvent.FEventHandler;
 import forge.toolbox.FEvent.FEventType;
@@ -86,18 +87,12 @@ public abstract class ItemView<T extends InventoryItem> {
         return false;
     }
     protected abstract float getScrollHeight();
-    protected abstract float layoutOptionsPanel(float visibleWidth, float height);
+    protected abstract void layoutOptionsPanel(float visibleWidth, float height);
 
-    private class OptionsPanel extends FScrollPane {
+    private class OptionsPanel extends FContainer {
         @Override
-        protected ScrollBounds layoutAndGetScrollBounds(float visibleWidth, float visibleHeight) {
-            return new ScrollBounds(layoutOptionsPanel(visibleWidth, visibleHeight), visibleHeight);
-        }
-
-        @Override
-        public void drawOverlay(Graphics g) {
-            super.drawOverlay(g);
-            g.drawLine(1, BORDER_COLOR, 0, 0, getWidth(), 0);
+        protected void doLayout(float width, float height) {
+            layoutOptionsPanel(width, height);
         }
     }
 
@@ -123,7 +118,7 @@ public abstract class ItemView<T extends InventoryItem> {
         return scroller;
     }
 
-    public FScrollPane getPnlOptions() {
+    public FContainer getPnlOptions() {
         return pnlOptions;
     }