Merge branch 'subtree'

[fanfix.git] / src / jexer / TList.java

diff --git a/src/jexer/TList.java b/src/jexer/TList.java
index 3aed01ed21c25131d2e70e96efdf4d4bd9039ed3..12e0b8a33cce977e93ce4a6fd30080adeb75e8dc 100644 (file)
--- a/src/jexer/TList.java
+++ b/src/jexer/TList.java
@@ -32,6 +32,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import jexer.bits.CellAttributes;
+import jexer.bits.StringUtils;
 import jexer.event.TKeypressEvent;
 import jexer.event.TMouseEvent;
 import static jexer.TKeypress.*;
@@ -93,7 +94,7 @@ public class TList extends TScrollableWidget {
     public TList(final TWidget parent, final List<String> strings, final int x,
         final int y, final int width, final int height) {
 
-        this(parent, strings, x, y, width, height, null);
+        this(parent, strings, x, y, width, height, null, null, null);
     }
 
     /**
@@ -112,16 +113,7 @@ public class TList extends TScrollableWidget {
         final int y, final int width, final int height,
         final TAction enterAction) {
 
-        super(parent, x, y, width, height);
-        this.enterAction = enterAction;
-        this.strings = new ArrayList<String>();
-        if (strings != null) {
-            this.strings.addAll(strings);
-        }
-
-        hScroller = new THScroller(this, 0, getHeight() - 1, getWidth() - 1);
-        vScroller = new TVScroller(this, getWidth() - 1, 0, getHeight() - 1);
-        reflowData();
+        this(parent, strings, x, y, width, height, enterAction, null, null);
     }
 
     /**
@@ -142,9 +134,35 @@ public class TList extends TScrollableWidget {
         final int y, final int width, final int height,
         final TAction enterAction, final TAction moveAction) {
 
+        this(parent, strings, x, y, width, height, enterAction, moveAction,
+            null);
+    }
+
+    /**
+     * Public constructor.
+     *
+     * @param parent parent widget
+     * @param strings list of strings to show.  This is allowed to be null
+     * and set later with setList() or by subclasses.
+     * @param x column relative to parent
+     * @param y row relative to parent
+     * @param width width of text area
+     * @param height height of text area
+     * @param enterAction action to perform when an item is selected
+     * @param moveAction action to perform when the user navigates to a new
+     * item with arrow/page keys
+     * @param singleClickAction action to perform when the user clicks on an
+     * item
+     */
+    public TList(final TWidget parent, final List<String> strings, final int x,
+        final int y, final int width, final int height,
+        final TAction enterAction, final TAction moveAction,
+        final TAction singleClickAction) {
+
         super(parent, x, y, width, height);
         this.enterAction = enterAction;
         this.moveAction = moveAction;
+        this.singleClickAction = singleClickAction;
         this.strings = new ArrayList<String>();
         if (strings != null) {
             this.strings.addAll(strings);
@@ -309,6 +327,38 @@ public class TList extends TScrollableWidget {
     // TScrollableWidget ------------------------------------------------------
     // ------------------------------------------------------------------------
 
+    /**
+     * Override TWidget's width: we need to set child widget widths.
+     *
+     * @param width new widget width
+     */
+    @Override
+    public void setWidth(final int width) {
+        super.setWidth(width);
+        if (hScroller != null) {
+            hScroller.setWidth(getWidth() - 1);
+        }
+        if (vScroller != null) {
+            vScroller.setX(getWidth() - 1);
+        }
+    }
+
+    /**
+     * Override TWidget's height: we need to set child widget heights.
+     *
+     * @param height new widget height
+     */
+    @Override
+    public void setHeight(final int height) {
+        super.setHeight(height);
+        if (hScroller != null) {
+            hScroller.setY(getHeight() - 1);
+        }
+        if (vScroller != null) {
+            vScroller.setHeight(getHeight() - 1);
+        }
+    }
+
     /**
      * Resize for a new width/height.
      */
@@ -321,8 +371,9 @@ public class TList extends TScrollableWidget {
 
         for (int i = 0; i < strings.size(); i++) {
             String line = strings.get(i);
-            if (line.length() > maxLineWidth) {
-                maxLineWidth = line.length();
+            int lineLength = StringUtils.width(line);
+            if (lineLength > maxLineWidth) {
+                maxLineWidth = lineLength;
             }
         }
 
@@ -347,6 +398,9 @@ public class TList extends TScrollableWidget {
         int topY = 0;
         for (int i = begin; i < strings.size(); i++) {
             String line = strings.get(i);
+            if (line == null) {
+                line = "";
+            }
             if (getHorizontalValue() < line.length()) {
                 line = line.substring(getHorizontalValue());
             } else {
@@ -463,7 +517,7 @@ public class TList extends TScrollableWidget {
         assert (selectedString >= 0);
         assert (selectedString < strings.size());
         if (enterAction != null) {
-            enterAction.DO();
+            enterAction.DO(this);
         }
     }
 
@@ -474,7 +528,7 @@ public class TList extends TScrollableWidget {
         assert (selectedString >= 0);
         assert (selectedString < strings.size());
         if (moveAction != null) {
-            moveAction.DO();
+            moveAction.DO(this);
         }
     }
 
@@ -485,7 +539,7 @@ public class TList extends TScrollableWidget {
         assert (selectedString >= 0);
         assert (selectedString < strings.size());
         if (singleClickAction != null) {
-            singleClickAction.DO();
+            singleClickAction.DO(this);
         }
     }