Make status bar message history popup the same size as the message label.

Fixes CLIENT-211

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

src/com/dmdirc/addons/ui_swing/components/statusbar/ErrorPanel.java

@@ -56,7 +56,6 @@ public class ErrorPanel extends StatusbarPopupPanel<JLabel> implements
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 2;
-
     /** non error state image icon. */
     private static final Icon DEFAULT_ICON = IconManager.getIconManager().
             getIcon("normal");

src/com/dmdirc/addons/ui_swing/components/statusbar/MessageLabel.java

@@ -79,7 +79,7 @@ public class MessageLabel extends JPanel implements StatusBarComponent,
                 IdentityManager.getGlobalConfig());
         currentMessage = defaultMessage;
         label = new JLabel();
-        historyLabel = new MessagePopup(parentWindow);
+        historyLabel = new MessagePopup(this, parentWindow);
         label.setText("Ready.");
         label.setBorder(new SidelessEtchedBorder(
                 SidelessEtchedBorder.Side.RIGHT));

src/com/dmdirc/addons/ui_swing/components/statusbar/MessagePopup.java

@@ -25,6 +25,8 @@ package com.dmdirc.addons.ui_swing.components.statusbar;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.StatusMessage;
 
+import java.awt.Dimension;
+import java.awt.Point;
 import java.awt.Window;
 import java.awt.event.MouseEvent;
 import java.util.ArrayList;
@@ -40,23 +42,31 @@ import javax.swing.UIManager;
  */
 class MessagePopup extends StatusbarTogglePanel<JLabel> {
 
+    /**
+     * A version number for this class. It should be changed whenever the class
+     * structure is changed (or anything else that would prevent serialized
+     * objects being unserialized with the new class).
+     */
+    private static final long serialVersionUID = 2;
     /** Parent window. */
     private final Window parentWindow;
     /** List of historical messages. */
     private final List<StatusMessage> messages;
+    /** Parent panel. */
+    private final JPanel parent;
 
     /**
      * Creates a new message history popup.
      *
-     * @param nonSelectedBorder Border when unselected
-     * @param selectedBorder Border when selected
-     * @param mainFrame Mainframe
+     * @param parent Parent to size against
+     * @param parentWindow Parent window
      */
-    public MessagePopup(final Window parentWindow) {
+    public MessagePopup(final JPanel parent, final Window parentWindow) {
         super(new JLabel("^"),
                 new SidelessEtchedBorder(SidelessEtchedBorder.Side.LEFT),
                 new SidelessEtchedBorder(SidelessEtchedBorder.Side.TOP));
         this.parentWindow = parentWindow;
+        this.parent = parent;
         messages = new ArrayList<StatusMessage>();
     }
 
@@ -102,6 +112,13 @@ class MessagePopup extends StatusbarTogglePanel<JLabel> {
     /** Message history status bar popup window. */
     private class MessageHistoryPanel extends StatusbarPopupWindow {
 
+        /**
+         * A version number for this class. It should be changed whenever the
+         * class structure is changed (or anything else that would prevent
+         * serialized objects being unserialized with the new class).
+         */
+        private static final long serialVersionUID = 2;
+
         /**
          * Creates a new message history window.
          *
@@ -115,6 +132,7 @@ class MessagePopup extends StatusbarTogglePanel<JLabel> {
         @Override
         protected void initContent(final JPanel panel) {
             panel.removeAll();
+            panel.setPreferredSize(new Dimension(parent.getSize()));
             if (messages.isEmpty()) {
                 panel.add(new JLabel("No previous messages."), "grow, push");
                 return;
@@ -127,5 +145,19 @@ class MessagePopup extends StatusbarTogglePanel<JLabel> {
                         "grow, push, wrap");
             }
         }
+
+        /* {@inheritDoc} */
+        @Override
+        protected Point getPopupLocation() {
+            final Point point = parent.getLocationOnScreen();
+            point.translate(parent.getWidth() / 2 - this.getWidth() / 2 - 2,
+                    - this.getHeight() + 1);
+            final int maxX = Math.max(parentWindow.getLocationOnScreen().x
+                    + parentWindow.getWidth() - 10 - getWidth(),
+                    parent.getLocationOnScreen().x + parent.getWidth() - 1
+                    - getWidth());
+            point.x = Math.min(maxX, point.x + 1);
+            return point;
+        }
     }
 }

src/com/dmdirc/addons/ui_swing/components/statusbar/StatusbarPopupWindow.java

@@ -36,7 +36,6 @@ import javax.swing.border.EtchedBorder;
 
 import net.miginfocom.swing.MigLayout;
 
-
  /**
  * A popup window which is shown above a status bar component to provide more
  * detailed information.
@@ -92,16 +91,7 @@ public abstract class StatusbarPopupWindow extends StandardDialog {
             setResizable(false);
 
             pack();
-
-            final Point point = parent.getLocationOnScreen();
-            point.translate(parent.getWidth() / 2 - this.getWidth() / 2,
-                    - this.getHeight());
-            final int maxX = Math.max(parentWindow.getLocationOnScreen().x
-                    + parentWindow.getWidth() - 10 - getWidth(),
-                    parent.getLocationOnScreen().x + parent.getWidth() - 1
-                    - getWidth());
-            point.x = Math.min(maxX, point.x);
-            setLocation(point);
+            setLocation(getPopupLocation());
 
             panel.setBorder(new GappedEtchedBorder());
         }
@@ -109,6 +99,23 @@ public abstract class StatusbarPopupWindow extends StandardDialog {
         super.setVisible(b);
     }
 
+    /**
+     * Returns the location the popup window should appear at.
+     *
+     * @return Point for popup to appear
+     */
+    protected Point getPopupLocation() {
+        final Point point = parent.getLocationOnScreen();
+        point.translate(parent.getWidth() / 2 - this.getWidth() / 2,
+                - this.getHeight());
+        final int maxX = Math.max(parentWindow.getLocationOnScreen().x
+                + parentWindow.getWidth() - 10 - getWidth(),
+                parent.getLocationOnScreen().x + parent.getWidth() - 1
+                - getWidth());
+        point.x = Math.min(maxX, point.x);
+        return point;
+    }
+
     /**
      * Initialises the content of the popup window.
      *