Hide colour picker dialogs when focus is lost.

Fixes CLIENT-191

Change-Id: I1f4d9617215e699282a5b934b7d2ecd842d62ed5
Reviewed-on: http://gerrit.dmdirc.com/1818
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/addons/ui_swing/components/inputfields/SwingInputField.java

@@ -33,11 +33,14 @@ import com.dmdirc.util.ReturnableThread;
 
 import java.awt.Color;
 import java.awt.FontMetrics;
+import java.awt.KeyboardFocusManager;
 import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 
 import javax.swing.JComponent;
 import javax.swing.JLabel;
@@ -49,7 +52,7 @@ import net.miginfocom.swing.MigLayout;
 
 /** Swing input field. */
 public class SwingInputField extends JComponent implements InputField,
-        KeyListener, InputValidationListener {
+        KeyListener, InputValidationListener, PropertyChangeListener {
 
     /**
      * A version number for this class. It should be changed whenever the class
@@ -108,6 +111,8 @@ public class SwingInputField extends JComponent implements InputField,
                 textField.getInputMap(SwingInputField.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT));
         setInputMap(SwingInputField.WHEN_IN_FOCUSED_WINDOW,
                 textField.getInputMap(SwingInputField.WHEN_IN_FOCUSED_WINDOW));
+        KeyboardFocusManager.getCurrentKeyboardFocusManager()
+                .addPropertyChangeListener(this);
     }
 
     /** {@inheritDoc} */
@@ -548,4 +553,12 @@ public class SwingInputField extends JComponent implements InputField,
             }
         });
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public void propertyChange(final PropertyChangeEvent evt) {
+        if (!isFocusOwner()) {
+            hideColourPicker();
+        }
+    }
 }

src/com/dmdirc/addons/ui_swing/components/inputfields/TextAreaInputField.java

@@ -19,23 +19,27 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+
 package com.dmdirc.addons.ui_swing.components.inputfields;
 
 import com.dmdirc.addons.ui_swing.components.colours.ColourPickerDialog;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.interfaces.InputField;
+import java.awt.KeyboardFocusManager;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 
 import javax.swing.JTextArea;
 import javax.swing.text.BadLocationException;
 
 /**
- *
- * @author chris
+ * JTextArea implementing InputField
  */
-public class TextAreaInputField extends JTextArea implements InputField {
+public class TextAreaInputField extends JTextArea implements InputField,
+        PropertyChangeListener {
     
     /**
      * A version number for this class. It should be changed whenever the class
@@ -55,6 +59,8 @@ public class TextAreaInputField extends JTextArea implements InputField {
      */
     public TextAreaInputField(final int rows, final int columns) {
         super(rows, columns);
+        KeyboardFocusManager.getCurrentKeyboardFocusManager()
+                .addPropertyChangeListener(this);
     }
 
     /**
@@ -64,6 +70,8 @@ public class TextAreaInputField extends JTextArea implements InputField {
      */
     public TextAreaInputField(final String text) {
         super(text);
+        KeyboardFocusManager.getCurrentKeyboardFocusManager()
+                .addPropertyChangeListener(this);
     }
     
     /** {@inheritDoc} */
@@ -114,4 +122,12 @@ public class TextAreaInputField extends JTextArea implements InputField {
         }
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public void propertyChange(final PropertyChangeEvent evt) {
+        if (!isFocusOwner()) {
+            hideColourPicker();
+        }
+    }
+
 }

src/com/dmdirc/addons/ui_swing/components/inputfields/TextFieldInputField.java

@@ -1,17 +1,17 @@
 /*
- * 
+ *
  * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -26,17 +26,21 @@ package com.dmdirc.addons.ui_swing.components.inputfields;
 import com.dmdirc.addons.ui_swing.components.colours.ColourPickerDialog;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.interfaces.InputField;
+import java.awt.KeyboardFocusManager;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 
 import javax.swing.JTextField;
 import javax.swing.text.BadLocationException;
 
 /**
- *
+ * JTextField implementing InputField.
  */
-public class TextFieldInputField extends JTextField implements InputField {
+public class TextFieldInputField extends JTextField implements InputField,
+        PropertyChangeListener {
 
     /**
      * A version number for this class. It should be changed whenever the class
@@ -47,6 +51,16 @@ public class TextFieldInputField extends JTextField implements InputField {
     /** Colour picker. */
     protected ColourPickerDialog colourPicker;
 
+    /**
+     * Creates a new text field input field.
+     */
+    public TextFieldInputField() {
+        super();
+
+        KeyboardFocusManager.getCurrentKeyboardFocusManager()
+                .addPropertyChangeListener(this);
+    }
+
     /** {@inheritDoc} */
     @Override
     public void showColourPicker(final boolean irc, final boolean hex) {
@@ -82,4 +96,12 @@ public class TextFieldInputField extends JTextField implements InputField {
             colourPicker = null;
         }
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public void propertyChange(final PropertyChangeEvent evt) {
+        if (!isFocusOwner()) {
+            hideColourPicker();
+        }
+    }
 }

src/com/dmdirc/addons/ui_swing/components/inputfields/TextPaneInputField.java

@@ -1,17 +1,16 @@
 /*
- * 
  * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -26,9 +25,12 @@ package com.dmdirc.addons.ui_swing.components.inputfields;
 import com.dmdirc.addons.ui_swing.components.colours.ColourPickerDialog;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.interfaces.InputField;
+import java.awt.KeyboardFocusManager;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
 
 import javax.swing.BorderFactory;
 import javax.swing.JEditorPane;
@@ -39,7 +41,8 @@ import javax.swing.text.BadLocationException;
 /**
  * JTextPane implementing InputField.
  */
-public class TextPaneInputField extends JEditorPane implements InputField {
+public class TextPaneInputField extends JEditorPane implements InputField,
+        PropertyChangeListener {
 
     /**
      * A version number for this class. It should be changed whenever the class
@@ -50,6 +53,16 @@ public class TextPaneInputField extends JEditorPane implements InputField {
     /** Colour picker. */
     protected ColourPickerDialog colourPicker;
 
+    /**
+     * Creates a new text pane input field.
+     */
+    public TextPaneInputField() {
+        super();
+
+        KeyboardFocusManager.getCurrentKeyboardFocusManager()
+                .addPropertyChangeListener(this);
+    }
+
     /** {@inheritDoc} */
     @Override
     public void showColourPicker(final boolean irc, final boolean hex) {
@@ -111,4 +124,12 @@ public class TextPaneInputField extends JEditorPane implements InputField {
         super.setUI(new BasicEditorPaneUI());
         super.setBorder(BorderFactory.createEmptyBorder(3, 3, 3, 3));
     }
+
+    /** {@inheritDoc} */
+    @Override
+    public void propertyChange(final PropertyChangeEvent evt) {
+        if (!isFocusOwner()) {
+            hideColourPicker();
+        }
+    }
 }