X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2Fui%2FGuiReaderBook.java;h=f0e1371eda728fa02504d5a602576f4244bedbbb;hb=e20686b41867b6cc906240fa61b751e4711bf817;hp=af2a5a783f370a7b0cd52d0c83f134545a6c5bc5;hpb=79a9950614d3bea63b0daafb7b7365f6ae3cbeb9;p=fanfix.git diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReaderBook.java b/src/be/nikiroo/fanfix/reader/ui/GuiReaderBook.java index af2a5a7..f0e1371 100644 --- a/src/be/nikiroo/fanfix/reader/ui/GuiReaderBook.java +++ b/src/be/nikiroo/fanfix/reader/ui/GuiReaderBook.java @@ -68,6 +68,7 @@ class GuiReaderBook extends JPanel { private List listeners; private GuiReaderBookInfo info; private boolean cached; + private boolean seeWordCount; /** * Create a new {@link GuiReaderBook} item for the given {@link Story}. @@ -83,22 +84,15 @@ class GuiReaderBook extends JPanel { */ public GuiReaderBook(Reader reader, GuiReaderBookInfo info, boolean cached, boolean seeWordCount) { - this.cached = cached; this.info = info; - - String optSecondary = info.getSecondaryInfo(seeWordCount); + this.cached = cached; + this.seeWordCount = seeWordCount; icon = new JLabel(GuiReaderCoverImager.generateCoverIcon( reader.getLibrary(), info)); - title = new JLabel( - String.format( - "" - + "" - + "%s" + "
" + "" - + "%s" + "" + "" + "", - GuiReaderCoverImager.TEXT_WIDTH, - GuiReaderCoverImager.TEXT_HEIGHT, info.getMainInfo(), - AUTHOR_COLOR, optSecondary)); + + title = new JLabel(); + updateTitle(); setLayout(new BorderLayout(10, 10)); add(icon, BorderLayout.CENTER); @@ -160,14 +154,14 @@ class GuiReaderBook extends JPanel { addMouseListener(new MouseListener() { @Override public void mouseReleased(MouseEvent e) { - if (e.isPopupTrigger()) { + if (isEnabled() && e.isPopupTrigger()) { popup(e); } } @Override public void mousePressed(MouseEvent e) { - if (e.isPopupTrigger()) { + if (isEnabled() && e.isPopupTrigger()) { popup(e); } } @@ -194,6 +188,7 @@ class GuiReaderBook extends JPanel { } lastClick = now; + e.consume(); } } @@ -212,6 +207,8 @@ class GuiReaderBook extends JPanel { listener.select((GuiReaderBook.this)); listener.popupRequested(GuiReaderBook.this, e); } + + e.consume(); } }); } @@ -258,12 +255,30 @@ class GuiReaderBook extends JPanel { } /** - * Paint the item, then call {@link GuiReaderBook#paintOverlay(Graphics)}. + * Update the title, paint the item, then call + * {@link GuiReaderCoverImager#paintOverlay(Graphics, boolean, boolean, boolean, boolean)} + * . */ @Override public void paint(Graphics g) { + updateTitle(); super.paint(g); GuiReaderCoverImager.paintOverlay(g, isEnabled(), isSelected(), isHovered(), isCached()); } + + /** + * Update the title with the currently registered information. + */ + private void updateTitle() { + String optSecondary = info.getSecondaryInfo(seeWordCount); + title.setText(String + .format("" + + "" + + "%s" + "
" + "" + "%s" + + "" + "" + "", + GuiReaderCoverImager.TEXT_WIDTH, + GuiReaderCoverImager.TEXT_HEIGHT, info.getMainInfo(), + AUTHOR_COLOR, optSecondary)); + } }