update jexer

[fanfix.git] / src / be / nikiroo / fanfix / reader / tui / TuiReaderStoryWindow.java

diff --git a/src/be/nikiroo/fanfix/reader/tui/TuiReaderStoryWindow.java b/src/be/nikiroo/fanfix/reader/tui/TuiReaderStoryWindow.java
index ddf7ad13d98e35a0d47e1984881067aa44131c8b..dc0afc245c9a8a1fb42401a5651830fe15dba42b 100644 (file)
--- a/src/be/nikiroo/fanfix/reader/tui/TuiReaderStoryWindow.java
+++ b/src/be/nikiroo/fanfix/reader/tui/TuiReaderStoryWindow.java
@@ -10,7 +10,6 @@ import java.util.List;
 import jexer.TAction;
 import jexer.TButton;
 import jexer.TLabel;
-import jexer.TTable;
 import jexer.TText;
 import jexer.TWindow;
 import jexer.event.TCommandEvent;
@@ -20,6 +19,7 @@ import be.nikiroo.fanfix.data.MetaData;
 import be.nikiroo.fanfix.data.Paragraph;
 import be.nikiroo.fanfix.data.Paragraph.ParagraphType;
 import be.nikiroo.fanfix.data.Story;
+import be.nikiroo.jexer.TTable;
 import be.nikiroo.utils.StringUtils;
 
 /**
@@ -50,8 +50,7 @@ class TuiReaderStoryWindow extends TWindow {
                // last = use window background
                titleField = new TLabel(this, "    Title", 0, 1, "tlabel", false);
                textField = new TText(this, "", 0, 0, 1, 1);
-               table = new TTable(this, 0, 0, 1, 1, null, null, Arrays.asList("Key",
-                               "Value"), true);
+               table = new TTable(this, 0, 0, 1, 1, null, null, Arrays.asList("Key", "Value"), true);
 
                titleField.setEnabled(false);
 
@@ -119,11 +118,7 @@ class TuiReaderStoryWindow extends TWindow {
                textField.getVerticalScroller().setX(
                                textField.getVerticalScroller().getX() + 1);
 
-               String name = currentChapter.getLabel();
-               int size = Math.max(name.length(), currentChapter.getWidth());
-               name = String.format("%" + size + "s", name);
-
-               currentChapter.setLabel(name);
+               setCurrentChapterText();
        }
 
        /**
@@ -303,10 +298,7 @@ class TuiReaderStoryWindow extends TWindow {
                }
 
                int width = getWidth() - currentChapter.getX();
-               while (name.length() < width) {
-                       name += " ";
-               }
-
+               name = String.format("%-" + width + "s", name);
                if (name.length() > width) {
                        name = name.substring(0, width);
                }