tui: fix story reader layout

[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 d4fac73a166594be5ee5d25ff8dde9ab6ddbc922..04d38c507c46187e3478ee5329b64705a407a2c3 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;
 
 /**
@@ -57,27 +57,25 @@ class TuiReaderStoryWindow extends TWindow {
 
                navigationButtons = new ArrayList<TButton>(5);
 
-               // for bg colour when << button is pressed
-               navigationButtons.add(addButton(" ", 0, 0, null));
-               navigationButtons.add(addButton("<<  ", 0, 0, new TAction() {
+               navigationButtons.add(addButton("<<", 0, 0, new TAction() {
                        @Override
                        public void DO() {
                                setChapter(-1);
                        }
                }));
-               navigationButtons.add(addButton("<  ", 4, 0, new TAction() {
+               navigationButtons.add(addButton("< ", 4, 0, new TAction() {
                        @Override
                        public void DO() {
                                setChapter(TuiReaderStoryWindow.this.chapter - 1);
                        }
                }));
-               navigationButtons.add(addButton(">  ", 7, 0, new TAction() {
+               navigationButtons.add(addButton("> ", 7, 0, new TAction() {
                        @Override
                        public void DO() {
                                setChapter(TuiReaderStoryWindow.this.chapter + 1);
                        }
                }));
-               navigationButtons.add(addButton(">>  ", 10, 0, new TAction() {
+               navigationButtons.add(addButton(">>", 10, 0, new TAction() {
                        @Override
                        public void DO() {
                                setChapter(getStory().getChapters().size());
@@ -86,16 +84,17 @@ class TuiReaderStoryWindow extends TWindow {
 
                navigationButtons.get(0).setEnabled(false);
                navigationButtons.get(1).setEnabled(false);
-               navigationButtons.get(2).setEnabled(false);
 
                currentChapter = addLabel("", 0, 0);
 
-               TSizeConstraint.setSize(sizeConstraints, textField, 1, 3, -1, 0);
-               TSizeConstraint.setSize(sizeConstraints, table, 0, 3, 0, 0);
+               TSizeConstraint.setSize(sizeConstraints, textField, 1, 3, -1, -1);
+               TSizeConstraint.setSize(sizeConstraints, table, 0, 3, 0, -1);
                TSizeConstraint.setSize(sizeConstraints, currentChapter, 14, -3, -1,
                                null);
 
                for (TButton navigationButton : navigationButtons) {
+                       navigationButton.setShadowColor(null);
+                       // navigationButton.setEmptyBorders(false);
                        TSizeConstraint.setSize(sizeConstraints, navigationButton, null,
                                        -3, null, null);
                }
@@ -116,8 +115,11 @@ class TuiReaderStoryWindow extends TWindow {
 
                TSizeConstraint.resize(sizeConstraints);
 
-               textField.getVerticalScroller().setX(
-                               textField.getVerticalScroller().getX() + 1);
+               // Improve the disposition of the scrollbars
+               textField.getVerticalScroller().setX(textField.getWidth());
+               textField.getVerticalScroller().setHeight(textField.getHeight());
+               textField.getHorizontalScroller().setX(-1);
+               textField.getHorizontalScroller().setWidth(textField.getWidth() + 1);
 
                setCurrentChapterText();
        }
@@ -141,9 +143,8 @@ class TuiReaderStoryWindow extends TWindow {
                        int max = getStory().getChapters().size();
                        navigationButtons.get(0).setEnabled(chapter > -1);
                        navigationButtons.get(1).setEnabled(chapter > -1);
-                       navigationButtons.get(2).setEnabled(chapter > -1);
+                       navigationButtons.get(2).setEnabled(chapter < max);
                        navigationButtons.get(3).setEnabled(chapter < max);
-                       navigationButtons.get(4).setEnabled(chapter < max);
 
                        if (chapter < 0) {
                                displayInfoPage();