From a3550a0a2d1ee45b4853c789440a4a3226fc00c7 Mon Sep 17 00:00:00 2001 From: Niki Roo Date: Sat, 18 May 2019 16:48:00 +0200 Subject: [PATCH] GUI: fix background colour --- .../fanfix/reader/ui/GuiReaderGroup.java | 23 +++++++++---------- .../fanfix/reader/ui/GuiReaderMainPanel.java | 3 ++- 2 files changed, 13 insertions(+), 13 deletions(-) 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. *

* Note: this class' implementation will also set the main pane background - * color at the same time. + * colour at the same time. *

- * 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 * JComponent or ComponentUI implementations. * Direct subclasses of JComponent must override - * paintComponent to honor this property. + * paintComponent to honour this property. *

- * 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 Color + * @param backgroundColor + * the desired background Colour * @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); -- 2.27.0