X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2FTText.java;h=22bc4b89051d31e586a60b91a274b55d3292bade;hb=12b90437b5f22c2ae6e9b9b14c3b62b60f6143e5;hp=4791fdc5e38e242e707a8ed97d64d618895463d1;hpb=e820d5dd4e52a787e7f53f6409bb6ff334c3ef7b;p=fanfix.git diff --git a/src/jexer/TText.java b/src/jexer/TText.java index 4791fdc..22bc4b8 100644 --- a/src/jexer/TText.java +++ b/src/jexer/TText.java @@ -164,8 +164,10 @@ public class TText extends TScrollableWidget { lines = new LinkedList(); - 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(); } @@ -173,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. */ @@ -190,8 +225,10 @@ public class TText extends TScrollableWidget { } 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)) {