Merge commit '8b2627ce767579eb616e262b3f45f810a88ec200'

[fanfix.git] / src / be / nikiroo / utils / ui / UIUtils.java

diff --git a/src/be/nikiroo/utils/ui/UIUtils.java b/src/be/nikiroo/utils/ui/UIUtils.java
index 9f16aabe79c3ba8dc80e8221bace21b2ec5f0d4a..5861d00fc3a6e3a254230c8bd5d43a17d26299db 100644 (file)
--- a/src/be/nikiroo/utils/ui/UIUtils.java
+++ b/src/be/nikiroo/utils/ui/UIUtils.java
@@ -178,12 +178,39 @@ public class UIUtils {
         * @return the {@link JScrollPane}
         */
        static public JScrollPane scroll(JComponent pane, boolean allowHorizontal) {
+               return scroll(pane, allowHorizontal, true);
+       }
+
+       /**
+        * Add a {@link JScrollPane} around the given panel and use a sensible (for
+        * me) increment for the mouse wheel.
+        * 
+        * @param pane
+        *            the panel to wrap in a {@link JScrollPane}
+        * @param allowHorizontal
+        *            allow horizontal scrolling (not always desired)
+        * @param allowVertical
+        *            allow vertical scrolling (usually yes, but sometimes you only
+        *            want horizontal)
+        * 
+        * @return the {@link JScrollPane}
+        */
+       static public JScrollPane scroll(JComponent pane, boolean allowHorizontal,
+                       boolean allowVertical) {
                JScrollPane scroll = new JScrollPane(pane);
+
                scroll.getVerticalScrollBar().setUnitIncrement(16);
+               scroll.getHorizontalScrollBar().setUnitIncrement(16);
+
                if (!allowHorizontal) {
                        scroll.setHorizontalScrollBarPolicy(
                                        JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
                }
+               if (!allowVertical) {
+                       scroll.setVerticalScrollBarPolicy(
+                                       JScrollPane.VERTICAL_SCROLLBAR_NEVER);
+               }
+
                return scroll;
        }
 }