From 037b7e62ee01d44324de36be0be1a62d37223f16 Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Wed, 26 Nov 2014 17:19:40 +0000
Subject: [PATCH] Prevent horizontal scrollbar appearing in zone windows.

---
 .../src/main/java/forge/toolbox/FScrollPane.java              | 3 +++
 .../src/main/java/forge/view/arcane/FloatingCardArea.java     | 4 +++-
 forge-gui/CHANGES.txt                                         | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/FScrollPane.java b/forge-gui-desktop/src/main/java/forge/toolbox/FScrollPane.java
index 078441f51c9..b2f65bf8cbb 100644
--- a/forge-gui-desktop/src/main/java/forge/toolbox/FScrollPane.java
+++ b/forge-gui-desktop/src/main/java/forge/toolbox/FScrollPane.java
@@ -23,6 +23,9 @@ public class FScrollPane extends SkinnedScrollPane {
     public FScrollPane(boolean showBorder0) {
         this(null, showBorder0);
     }
+    public FScrollPane(boolean showBorder0, final int vertical0, final int horizontal0) {
+        this(null, showBorder0, false, vertical0, horizontal0);
+    }
     public FScrollPane(final Component c0, boolean showBorder0) {
         this(c0, showBorder0, false, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
     }
diff --git a/forge-gui-desktop/src/main/java/forge/view/arcane/FloatingCardArea.java b/forge-gui-desktop/src/main/java/forge/view/arcane/FloatingCardArea.java
index 328f6eb57f3..23eb7be50bf 100644
--- a/forge-gui-desktop/src/main/java/forge/view/arcane/FloatingCardArea.java
+++ b/forge-gui-desktop/src/main/java/forge/view/arcane/FloatingCardArea.java
@@ -46,6 +46,8 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
+import javax.swing.ScrollPaneConstants;
+
 
 public class FloatingCardArea extends CardArea {
     private static final long serialVersionUID = 1927906492186378596L;
@@ -131,7 +133,7 @@ public class FloatingCardArea extends CardArea {
     };
 
     private FloatingCardArea(PlayerView player0, ZoneType zone0) {
-        super(new FScrollPane(false));
+        super(new FScrollPane(false, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
         window.add(getScrollPane(), "grow, push");
         getScrollPane().setViewportView(this);
         setOpaque(false);
diff --git a/forge-gui/CHANGES.txt b/forge-gui/CHANGES.txt
index 72789b922c4..baff0b67e25 100644
--- a/forge-gui/CHANGES.txt
+++ b/forge-gui/CHANGES.txt
@@ -21,6 +21,7 @@ Popup windows for zones (Hand, Library, Graveyard, Exile, Flashback) will now re
 Clicking the zone icon under a player's avatar will now hide the zone window if its currently open.
 After the last card is removed from a zone window, that window will now automatically be hidden. An example of this would be casting the last card in the Flashback zone.
 Default size of zone windows has been slightly reduced.
+Prevent horizontal scrollbar appearing in zone windows.
 
 ---------
 New Cards