Add 'src/jexer/' from commit 'cf01c92f5809a0732409e280fb0f32f27393618d'

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

diff --git a/src/jexer/TText.java b/src/jexer/TText.java
index 60f0e585c9d4faede83c681011a97d8a27a4bbf0..22bc4b89051d31e586a60b91a274b55d3292bade 100644 (file)
--- a/src/jexer/TText.java
+++ b/src/jexer/TText.java
@@ -33,6 +33,7 @@ import java.util.LinkedList;
 import java.util.List;
 
 import jexer.bits.CellAttributes;
+import jexer.bits.StringUtils;
 import jexer.event.TKeypressEvent;
 import jexer.event.TMouseEvent;
 import static jexer.TKeypress.kbDown;
@@ -163,8 +164,10 @@ public class TText extends TScrollableWidget {
 
         lines = new LinkedList<String>();
 
-        vScroller = new TVScroller(this, getWidth() - 1, 0, getHeight() - 1);
-        hScroller = new THScroller(this, 0, getHeight() - 1, getWidth() - 1);
+        vScroller = new TVScroller(this, getWidth() - 1, 0,
+            Math.max(1, getHeight() - 1));
+        hScroller = new THScroller(this, 0, getHeight() - 1,
+            Math.max(1, getWidth() - 1));
         reflowData();
     }
 
@@ -172,6 +175,39 @@ public class TText 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.
+     * time.
+     *
+     * @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);
+        }
+    }
+
     /**
      * Draw the text box.
      */
@@ -184,13 +220,15 @@ public class TText extends TScrollableWidget {
         int topY = 0;
         for (int i = begin; i < lines.size(); i++) {
             String line = lines.get(i);
-            if (hScroller.getValue() < line.length()) {
+            if (hScroller.getValue() < StringUtils.width(line)) {
                 line = line.substring(hScroller.getValue());
             } else {
                 line = "";
             }
-            String formatString = "%-" + Integer.toString(getWidth() - 1) + "s";
-            putStringXY(0, topY, String.format(formatString, line), color);
+            if (getWidth() > 3) {
+                String formatString = "%-" + Integer.toString(getWidth() - 1) + "s";
+                putStringXY(0, topY, String.format(formatString, line), color);
+            }
             topY++;
 
             if (topY >= (getHeight() - 1)) {
@@ -323,7 +361,7 @@ public class TText extends TScrollableWidget {
      * @param line new line to add
      */
     public void addLine(final String line) {
-        if (text.length() == 0) {
+        if (StringUtils.width(text) == 0) {
             text = line;
         } else {
             text += "\n\n";
@@ -338,8 +376,8 @@ public class TText extends TScrollableWidget {
     private void computeBounds() {
         maxLineWidth = 0;
         for (String line : lines) {
-            if (line.length() > maxLineWidth) {
-                maxLineWidth = line.length();
+            if (StringUtils.width(line) > maxLineWidth) {
+                maxLineWidth = StringUtils.width(line);
             }
         }