X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2FTList.java;h=644c5647afafa5cb7ce81d3f3a75b3faa3908dd1;hb=6f8ff91a29056209f9fd5f40e2dcf1ae285e0210;hp=2312889722707ee6d6ea06f3dfcc5523c59c0314;hpb=a2018e9964f6c58742cd1e6dd0a0c63e244a89d6;p=fanfix.git

diff --git a/src/jexer/TList.java b/src/jexer/TList.java
index 2312889..644c564 100644
--- a/src/jexer/TList.java
+++ b/src/jexer/TList.java
@@ -39,7 +39,7 @@ import static jexer.TKeypress.*;
 /**
  * TList shows a list of strings, and lets the user select one.
  */
-public class TList extends TWidget {
+public class TList extends TScrollableWidget {
 
     /**
      * The list of strings to display.
@@ -82,42 +82,23 @@ public class TList extends TWidget {
     }
 
     /**
-     * Set the new list of strings to display.
+     * Get the maximum selection index value.
      *
-     * @param list new list of strings
+     * @return -1 if the list is empty
      */
-    public final void setList(final List<String> list) {
-        strings.clear();
-        strings.addAll(list);
-        reflow();
+    public final int getMaxSelectedIndex() {
+        return strings.size() - 1;
     }
 
     /**
-     * Vertical scrollbar.
-     */
-    private TVScroller vScroller;
-
-    /**
-     * Get the vertical scrollbar.  This is used by subclasses.
-     *
-     * @return the vertical scrollbar
-     */
-    public final TVScroller getVScroller() {
-        return vScroller;
-    }
-
-    /**
-     * Horizontal scrollbar.
-     */
-    private THScroller hScroller;
-
-    /**
-     * Get the horizontal scrollbar.  This is used by subclasses.
+     * Set the new list of strings to display.
      *
-     * @return the horizontal scrollbar
+     * @param list new list of strings
      */
-    public final THScroller getHScroller() {
-        return hScroller;
+    public final void setList(final List<String> list) {
+        strings.clear();
+        strings.addAll(list);
+        reflowData();
     }
 
     /**
@@ -160,7 +141,8 @@ public class TList extends TWidget {
     /**
      * Resize for a new width/height.
      */
-    public void reflow() {
+    @Override
+    public void reflowData() {
 
         // Reset the lines
         selectedString = -1;
@@ -173,37 +155,15 @@ public class TList extends TWidget {
             }
         }
 
-        // Start at the top
-        if (vScroller == null) {
-            vScroller = new TVScroller(this, getWidth() - 1, 0,
-                getHeight() - 1);
-        } else {
-            vScroller.setX(getWidth() - 1);
-            vScroller.setHeight(getHeight() - 1);
-        }
-        vScroller.setBottomValue(strings.size() - getHeight() + 1);
-        vScroller.setTopValue(0);
-        vScroller.setValue(0);
-        if (vScroller.getBottomValue() < 0) {
-            vScroller.setBottomValue(0);
+        setBottomValue(strings.size() - getHeight() + 1);
+        if (getBottomValue() < 0) {
+            setBottomValue(0);
         }
-        vScroller.setBigChange(getHeight() - 1);
 
-        // Start at the left
-        if (hScroller == null) {
-            hScroller = new THScroller(this, 0, getHeight() - 1,
-                getWidth() - 1);
-        } else {
-            hScroller.setY(getHeight() - 1);
-            hScroller.setWidth(getWidth() - 1);
-        }
-        hScroller.setRightValue(maxLineWidth - getWidth() + 1);
-        hScroller.setLeftValue(0);
-        hScroller.setValue(0);
-        if (hScroller.getRightValue() < 0) {
-            hScroller.setRightValue(0);
+        setRightValue(maxLineWidth - getWidth() + 1);
+        if (getRightValue() < 0) {
+            setRightValue(0);
         }
-        hScroller.setBigChange(getWidth() - 1);
     }
 
     /**
@@ -244,7 +204,10 @@ public class TList extends TWidget {
         if (strings != null) {
             this.strings.addAll(strings);
         }
-        reflow();
+
+        hScroller = new THScroller(this, 0, getHeight() - 1, getWidth() - 1);
+        vScroller = new TVScroller(this, getWidth() - 1, 0, getHeight() - 1);
+        reflowData();
     }
 
     /**
@@ -272,7 +235,10 @@ public class TList extends TWidget {
         if (strings != null) {
             this.strings.addAll(strings);
         }
-        reflow();
+
+        hScroller = new THScroller(this, 0, getHeight() - 1, getWidth() - 1);
+        vScroller = new TVScroller(this, getWidth() - 1, 0, getHeight() - 1);
+        reflowData();
     }
 
     /**
@@ -281,12 +247,12 @@ public class TList extends TWidget {
     @Override
     public void draw() {
         CellAttributes color = null;
-        int begin = vScroller.getValue();
+        int begin = getVerticalValue();
         int topY = 0;
         for (int i = begin; i < strings.size(); i++) {
             String line = strings.get(i);
-            if (hScroller.getValue() < line.length()) {
-                line = line.substring(hScroller.getValue());
+            if (getHorizontalValue() < line.length()) {
+                line = line.substring(getHorizontalValue());
             } else {
                 line = "";
             }
@@ -326,20 +292,20 @@ public class TList extends TWidget {
     @Override
     public void onMouseDown(final TMouseEvent mouse) {
         if (mouse.isMouseWheelUp()) {
-            vScroller.decrement();
+            verticalDecrement();
             return;
         }
         if (mouse.isMouseWheelDown()) {
-            vScroller.increment();
+            verticalIncrement();
             return;
         }
 
         if ((mouse.getX() < getWidth() - 1)
             && (mouse.getY() < getHeight() - 1)) {
-            if (vScroller.getValue() + mouse.getY() < strings.size()) {
-                selectedString = vScroller.getValue() + mouse.getY();
+            if (getVerticalValue() + mouse.getY() < strings.size()) {
+                selectedString = getVerticalValue() + mouse.getY();
+                dispatchEnter();
             }
-            dispatchEnter();
             return;
         }
 
@@ -355,15 +321,15 @@ public class TList extends TWidget {
     @Override
     public void onKeypress(final TKeypressEvent keypress) {
         if (keypress.equals(kbLeft)) {
-            hScroller.decrement();
+            horizontalDecrement();
         } else if (keypress.equals(kbRight)) {
-            hScroller.increment();
+            horizontalIncrement();
         } else if (keypress.equals(kbUp)) {
             if (strings.size() > 0) {
                 if (selectedString >= 0) {
                     if (selectedString > 0) {
-                        if (selectedString - vScroller.getValue() == 0) {
-                            vScroller.decrement();
+                        if (selectedString - getVerticalValue() == 0) {
+                            verticalDecrement();
                         }
                         selectedString--;
                     }
@@ -379,8 +345,8 @@ public class TList extends TWidget {
                 if (selectedString >= 0) {
                     if (selectedString < strings.size() - 1) {
                         selectedString++;
-                        if (selectedString - vScroller.getValue() == getHeight() - 1) {
-                            vScroller.increment();
+                        if (selectedString - getVerticalValue() == getHeight() - 1) {
+                            verticalIncrement();
                         }
                     }
                 } else {
@@ -391,7 +357,7 @@ public class TList extends TWidget {
                 dispatchMove();
             }
         } else if (keypress.equals(kbPgUp)) {
-            vScroller.bigDecrement();
+            bigVerticalDecrement();
             if (selectedString >= 0) {
                 selectedString -= getHeight() - 1;
                 if (selectedString < 0) {
@@ -402,7 +368,7 @@ public class TList extends TWidget {
                 dispatchMove();
             }
         } else if (keypress.equals(kbPgDn)) {
-            vScroller.bigIncrement();
+            bigVerticalIncrement();
             if (selectedString >= 0) {
                 selectedString += getHeight() - 1;
                 if (selectedString > strings.size() - 1) {
@@ -413,7 +379,7 @@ public class TList extends TWidget {
                 dispatchMove();
             }
         } else if (keypress.equals(kbHome)) {
-            vScroller.toTop();
+            toTop();
             if (strings.size() > 0) {
                 selectedString = 0;
             }
@@ -421,7 +387,7 @@ public class TList extends TWidget {
                 dispatchMove();
             }
         } else if (keypress.equals(kbEnd)) {
-            vScroller.toBottom();
+            toBottom();
             if (strings.size() > 0) {
                 selectedString = strings.size() - 1;
             }