X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2FTText.java;h=f6d7febcc0aefdcd159aa3e5af50d72f1631be0f;hb=c4cefaa04ec122fc02efb6542451a31fdf722c32;hp=44176a4efa8979143b77cb74788c308824ade5c1;hpb=615a0d99fd0aa4437116dd083147f9150d5e6527;p=fanfix.git

diff --git a/src/jexer/TText.java b/src/jexer/TText.java
index 44176a4..f6d7feb 100644
--- a/src/jexer/TText.java
+++ b/src/jexer/TText.java
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (C) 2017 Kevin Lamonte
+ * Copyright (C) 2019 Kevin Lamonte
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -28,10 +28,12 @@
  */
 package jexer;
 
-import java.util.LinkedList;
+import java.util.Arrays;
+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.kbDown;
@@ -57,6 +59,12 @@ public class TText extends TScrollableWidget {
      * Available text justifications.
      */
     public enum Justification {
+
+        /**
+         * Not justified at all, use spacing as provided by the client.
+         */
+        NONE,
+
         /**
          * Left-justified text.
          */
@@ -154,10 +162,12 @@ public class TText extends TScrollableWidget {
         this.text = text;
         this.colorKey = colorKey;
 
-        lines = new LinkedList<String>();
+        lines = new ArrayList<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();
     }
 
@@ -165,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.
      */
@@ -177,14 +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";
-            getScreen().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)) {
@@ -194,7 +238,7 @@ public class TText extends TScrollableWidget {
 
         // Pad the rest with blank lines
         for (int i = topY; i < (getHeight() - 1); i++) {
-            getScreen().hLineXY(0, i, getWidth() - 1, ' ', color);
+            hLineXY(0, i, getWidth() - 1, ' ', color);
         }
 
     }
@@ -260,6 +304,9 @@ public class TText extends TScrollableWidget {
         String[] paragraphs = text.split("\n\n");
         for (String p : paragraphs) {
             switch (justification) {
+            case NONE:
+                lines.addAll(Arrays.asList(p.split("\n")));
+                break;
             case LEFT:
                 lines.addAll(jexer.bits.StringUtils.left(p,
                         getWidth() - 1));
@@ -314,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";
@@ -329,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);
             }
         }
 
@@ -356,7 +403,7 @@ public class TText extends TScrollableWidget {
     /**
      * Set justification.
      *
-     * @param justification LEFT, CENTER, RIGHT, or FULL
+     * @param justification NONE, LEFT, CENTER, RIGHT, or FULL
      */
     public void setJustification(final Justification justification) {
         this.justification = justification;
@@ -395,4 +442,12 @@ public class TText extends TScrollableWidget {
         reflowData();
     }
 
+    /**
+     * Un-justify the text.
+     */
+    public void unJustify() {
+        justification = Justification.NONE;
+        reflowData();
+    }
+
 }