X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2Ftui%2FTuiReaderStoryWindow.java;h=ddf7ad13d98e35a0d47e1984881067aa44131c8b;hb=f00daa5ee4c1e5de819f06b17282a87e8d328fd4;hp=f5a2bfa547d8804835667f5140d2bcd8f632a873;hpb=cf9c5ed1164709d753d9c93ae8589f09b2f90ac0;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/reader/tui/TuiReaderStoryWindow.java b/src/be/nikiroo/fanfix/reader/tui/TuiReaderStoryWindow.java
index f5a2bfa..ddf7ad1 100644
--- a/src/be/nikiroo/fanfix/reader/tui/TuiReaderStoryWindow.java
+++ b/src/be/nikiroo/fanfix/reader/tui/TuiReaderStoryWindow.java
@@ -15,13 +15,11 @@ import jexer.TText;
 import jexer.TWindow;
 import jexer.event.TCommandEvent;
 import jexer.event.TResizeEvent;
-import jexer.event.TResizeEvent.Type;
 import be.nikiroo.fanfix.data.Chapter;
 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.fanfix.library.BasicLibrary;
 import be.nikiroo.utils.StringUtils;
 
 /**
@@ -31,8 +29,6 @@ import be.nikiroo.utils.StringUtils;
  * @author niki
  */
 class TuiReaderStoryWindow extends TWindow {
-	private BasicLibrary lib;
-	private MetaData meta;
 	private Story story;
 	private TLabel titleField;
 	private TText textField;
@@ -40,53 +36,48 @@ class TuiReaderStoryWindow extends TWindow {
 	private int chapter = -99; // invalid value
 	private List<TButton> navigationButtons;
 	private TLabel currentChapter;
+	private List<TSizeConstraint> sizeConstraints = new ArrayList<TSizeConstraint>();
 
 	// chapter: -1 for "none" (0 is desc)
-	public TuiReaderStoryWindow(TuiReaderApplication app, BasicLibrary lib,
-			MetaData meta, int chapter) {
-		super(app, desc(meta), 0, 0, 60, 18, CENTERED | RESIZABLE);
+	public TuiReaderStoryWindow(TuiReaderApplication app, Story story,
+			int chapter) {
+		super(app, desc(story.getMeta()), 0, 0, 60, 18, CENTERED | RESIZABLE);
 
-		this.lib = lib;
-		this.meta = meta;
+		this.story = story;
 
-		app.setStatusBar(this, desc(meta));
+		app.setStatusBar(this, desc(story.getMeta()));
 
 		// last = use window background
 		titleField = new TLabel(this, "    Title", 0, 1, "tlabel", false);
-		textField = new TText(this, "", 1, 3, getWidth() - 4, getHeight() - 5);
-		table = new TTable(this, 0, 3, getWidth(), getHeight() - 4, null, null,
-				Arrays.asList("Key", "Value"), true);
+		textField = new TText(this, "", 0, 0, 1, 1);
+		table = new TTable(this, 0, 0, 1, 1, null, null, Arrays.asList("Key",
+				"Value"), true);
 
 		titleField.setEnabled(false);
-		textField.getVerticalScroller().setX(
-				textField.getVerticalScroller().getX() + 1);
 
 		navigationButtons = new ArrayList<TButton>(5);
 
-		// -3 because 0-based and 2 for borders
-		int row = getHeight() - 3;
-
 		// for bg colour when << button is pressed
-		navigationButtons.add(addButton(" ", 0, row, null));
-		navigationButtons.add(addButton("<<  ", 0, row, new TAction() {
+		navigationButtons.add(addButton(" ", 0, 0, null));
+		navigationButtons.add(addButton("<<  ", 0, 0, new TAction() {
 			@Override
 			public void DO() {
 				setChapter(-1);
 			}
 		}));
-		navigationButtons.add(addButton("<  ", 4, row, new TAction() {
+		navigationButtons.add(addButton("<  ", 4, 0, new TAction() {
 			@Override
 			public void DO() {
 				setChapter(TuiReaderStoryWindow.this.chapter - 1);
 			}
 		}));
-		navigationButtons.add(addButton(">  ", 7, row, new TAction() {
+		navigationButtons.add(addButton(">  ", 7, 0, new TAction() {
 			@Override
 			public void DO() {
 				setChapter(TuiReaderStoryWindow.this.chapter + 1);
 			}
 		}));
-		navigationButtons.add(addButton(">>  ", 10, row, new TAction() {
+		navigationButtons.add(addButton(">>  ", 10, 0, new TAction() {
 			@Override
 			public void DO() {
 				setChapter(getStory().getChapters().size());
@@ -97,41 +88,42 @@ class TuiReaderStoryWindow extends TWindow {
 		navigationButtons.get(1).setEnabled(false);
 		navigationButtons.get(2).setEnabled(false);
 
-		currentChapter = addLabel("", 14, row);
-		currentChapter.setWidth(getWidth() - 10);
+		currentChapter = addLabel("", 0, 0);
+
+		TSizeConstraint.setSize(sizeConstraints, textField, 1, 3, -1, 0);
+		TSizeConstraint.setSize(sizeConstraints, table, 0, 3, 0, 0);
+		TSizeConstraint.setSize(sizeConstraints, currentChapter, 14, -3, -1,
+				null);
+
+		for (TButton navigationButton : navigationButtons) {
+			TSizeConstraint.setSize(sizeConstraints, navigationButton, null,
+					-3, null, null);
+		}
+
+		onResize(null);
 
 		setChapter(chapter);
 	}
 
 	@Override
 	public void onResize(TResizeEvent resize) {
-		super.onResize(resize);
+		if (resize != null) {
+			super.onResize(resize);
+		}
 
-		// Resize the text field
-		// TODO: why setW/setH/reflow not enough for the scrollbars?
-		textField.onResize(new TResizeEvent(Type.WIDGET, resize.getWidth() - 4,
-				resize.getHeight() - 5));
-		textField.getVerticalScroller().setX(
-				textField.getVerticalScroller().getX() + 1);
+		// TODO: find out why TText and TTable does not behave the same way
+		// (offset of 2 for height and width)
 
-		table.setWidth(getWidth());
-		table.setHeight(getHeight() - 4);
-		table.reflowData();
+		TSizeConstraint.resize(sizeConstraints);
 
-		// -3 because 0-based and 2 for borders
-		int row = getHeight() - 3;
+		textField.getVerticalScroller().setX(
+				textField.getVerticalScroller().getX() + 1);
 
 		String name = currentChapter.getLabel();
-		while (name.length() < resize.getWidth() - currentChapter.getX()) {
-			name += " ";
-		}
-		currentChapter.setLabel(name);
-		currentChapter.setWidth(resize.getWidth() - 10);
-		currentChapter.setY(row);
+		int size = Math.max(name.length(), currentChapter.getWidth());
+		name = String.format("%" + size + "s", name);
 
-		for (TButton button : navigationButtons) {
-			button.setY(row);
-		}
+		currentChapter.setLabel(name);
 	}
 
 	/**
@@ -274,10 +266,6 @@ class TuiReaderStoryWindow extends TWindow {
 	}
 
 	private Story getStory() {
-		if (story == null) {
-			// TODO: progress bar?
-			story = lib.getStory(meta.getLuid(), null);
-		}
 		return story;
 	}