step 2

[fanfix.git] / src / be / nikiroo / fanfix / reader / ui / GuiReaderBook.java

diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReaderBook.java b/src/be/nikiroo/fanfix/reader/ui/GuiReaderBook.java
index 15d2ad4407ed487554a5586e6c2012986e5b2fb3..728964baa3faa82676f3b7a6fb6c875b6529bebf 100644 (file)
--- a/src/be/nikiroo/fanfix/reader/ui/GuiReaderBook.java
+++ b/src/be/nikiroo/fanfix/reader/ui/GuiReaderBook.java
@@ -112,6 +112,9 @@ class GuiReaderBook extends JPanel {
 
        /**
         * The book current selection state.
+        * <p>
+        * Setting this value to true can cause a "select" action to occur if the
+        * previous state was "unselected".
         * 
         * @param selected
         *            TRUE if it is selected
@@ -120,6 +123,10 @@ class GuiReaderBook extends JPanel {
                if (this.selected != selected) {
                        this.selected = selected;
                        repaint();
+
+                       if (selected) {
+                               select();
+                       }
                }
        }
 
@@ -154,14 +161,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);
                                }
                        }
@@ -188,16 +195,15 @@ class GuiReaderBook extends JPanel {
                                        }
 
                                        lastClick = now;
+                                       e.consume();
                                }
                        }
 
                        private void click(boolean doubleClick) {
-                               for (BookActionListener listener : listeners) {
-                                       if (doubleClick) {
-                                               listener.action(GuiReaderBook.this);
-                                       } else {
-                                               listener.select(GuiReaderBook.this);
-                                       }
+                               if (doubleClick) {
+                                       action();
+                               } else {
+                                       select();
                                }
                        }
 
@@ -206,6 +212,8 @@ class GuiReaderBook extends JPanel {
                                        listener.select((GuiReaderBook.this));
                                        listener.popupRequested(GuiReaderBook.this, e);
                                }
+
+                               e.consume();
                        }
                });
        }
@@ -220,6 +228,24 @@ class GuiReaderBook extends JPanel {
                listeners.add(listener);
        }
 
+       /**
+        * Cause an action to occur on this {@link GuiReaderBook}.
+        */
+       public void action() {
+               for (BookActionListener listener : listeners) {
+                       listener.action(GuiReaderBook.this);
+               }
+       }
+
+       /**
+        * Cause a select event on this {@link GuiReaderBook}.
+        */
+       private void select() {
+               for (BookActionListener listener : listeners) {
+                       listener.select(GuiReaderBook.this);
+               }
+       }
+
        /**
         * The information about the book represented by this item.
         *