From: Niki Roo <niki@nikiroo.be>
Date: Sat, 18 May 2019 14:48:00 +0000 (+0200)
Subject: GUI: fix background colour
X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=a3550a0a2d1ee45b4853c789440a4a3226fc00c7;p=fanfix-jexer.git

GUI: fix background colour
---

diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReaderGroup.java b/src/be/nikiroo/fanfix/reader/ui/GuiReaderGroup.java
index 7275498..cc3f1e1 100644
--- a/src/be/nikiroo/fanfix/reader/ui/GuiReaderGroup.java
+++ b/src/be/nikiroo/fanfix/reader/ui/GuiReaderGroup.java
@@ -116,31 +116,33 @@ public class GuiReaderGroup extends JPanel {
 	}
 
 	/**
-	 * Note: this class supports NULL as a background color, which will revert
+	 * Note: this class supports NULL as a background colour, which will revert
 	 * it to its default state.
 	 * <p>
 	 * Note: this class' implementation will also set the main pane background
-	 * color at the same time.
+	 * colour at the same time.
 	 * <p>
-	 * Sets the background color of this component. The background color is used
-	 * only if the component is opaque, and only by subclasses of
+	 * Sets the background colour of this component. The background colour is
+	 * used only if the component is opaque, and only by subclasses of
 	 * <code>JComponent</code> or <code>ComponentUI</code> implementations.
 	 * Direct subclasses of <code>JComponent</code> must override
-	 * <code>paintComponent</code> to honor this property.
+	 * <code>paintComponent</code> to honour this property.
 	 * <p>
-	 * It is up to the look and feel to honor this property, some may choose to
+	 * It is up to the look and feel to honour this property, some may choose to
 	 * ignore it.
 	 * 
-	 * @param bg
-	 *            the desired background <code>Color</code>
+	 * @param backgroundColor
+	 *            the desired background <code>Colour</code>
 	 * @see java.awt.Component#getBackground
 	 * @see #setOpaque
 	 * 
 	 * @beaninfo preferred: true bound: true attribute: visualUpdate true
-	 *           description: The background color of the component.
+	 *           description: The background colour of the component.
 	 */
 	@Override
 	public void setBackground(Color backgroundColor) {
+		this.backgroundColor = backgroundColor;
+		
 		Color cme = backgroundColor == null ? backgroundColorDef
 				: backgroundColor;
 		Color cpane = backgroundColor == null ? backgroundColorDefPane
@@ -209,9 +211,6 @@ public class GuiReaderGroup extends JPanel {
 
 	/**
 	 * Refresh the list of {@link GuiReaderBook}s displayed in the control.
-	 * 
-	 * @param infos
-	 *            the new list of infos
 	 */
 	public void refreshBooks() {
 		refreshBooks(infos, words);
diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReaderMainPanel.java b/src/be/nikiroo/fanfix/reader/ui/GuiReaderMainPanel.java
index 3153dea..8593fe6 100644
--- a/src/be/nikiroo/fanfix/reader/ui/GuiReaderMainPanel.java
+++ b/src/be/nikiroo/fanfix/reader/ui/GuiReaderMainPanel.java
@@ -138,6 +138,7 @@ class GuiReaderMainPanel extends JPanel {
 
 		pane = new JPanel();
 		pane.setLayout(new BoxLayout(pane, BoxLayout.PAGE_AXIS));
+		JScrollPane scroll = new JScrollPane(pane);
 
 		Integer icolor = Instance.getUiConfig().getColor(
 				UiConfig.BACKGROUND_COLOR);
@@ -145,9 +146,9 @@ class GuiReaderMainPanel extends JPanel {
 			color = new Color(icolor);
 			setBackground(color);
 			pane.setBackground(color);
+			scroll.setBackground(color);
 		}
 
-		JScrollPane scroll = new JScrollPane(pane);
 		scroll.getVerticalScrollBar().setUnitIncrement(16);
 		add(scroll, BorderLayout.CENTER);