More smiley related work (some alignment and comments). Addressing issue #500 Corrupt smiley images.

17 years ago · bfce580dcf
parent a5c9522ee3
commit bfce580dcf
1 changed files with 53 additions and 6 deletions
--- a/src/net/java/sip/communicator/impl/gui/main/chat/SmileysSelectorBox.java
+++ b/src/net/java/sip/communicator/impl/gui/main/chat/SmileysSelectorBox.java
@ -43,6 +43,7 @@ public class SmileysSelectorBox
        = new GridBagConstraints();

    private final JLabel smileyTextLabel = new JLabel();
+    private final JLabel smileyDescriptionLabel = new JLabel();

    /**
     * Creates an instance of this <tt>SmileysSelectorBox</tt> and initializes
@ -80,15 +81,24 @@ public SmileysSelectorBox(Collection<Smiley> imageList,
        }

        smileyTextLabel.setPreferredSize(new Dimension(50, 25));
-        smileyTextLabel.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0));
+        smileyTextLabel.setBorder(
+            BorderFactory.createEmptyBorder(0, 0, 0, 5));
+        smileyDescriptionLabel.setBorder(
+            BorderFactory.createEmptyBorder(0, 5, 0, 0));

        gridBagConstraints.fill = GridBagConstraints.HORIZONTAL;
        gridBagConstraints.gridx = 0;
        gridBagConstraints.gridy = gridRowCount;
        gridBagConstraints.gridwidth = gridColCount;

-        popupMenu.add(smileyTextLabel, gridBagConstraints);
+        popupMenu.add(smileyDescriptionLabel, gridBagConstraints);

+        gridBagConstraints.fill = GridBagConstraints.HORIZONTAL;
+        gridBagConstraints.gridx = gridColCount/2;
+        gridBagConstraints.gridy = gridRowCount;
+
+        smileyTextLabel.setHorizontalAlignment(SwingConstants.RIGHT);
+        popupMenu.add(smileyTextLabel, gridBagConstraints);

        this.add(selectorBox);
    }
@ -171,7 +181,7 @@ public void actionPerformed(ActionEvent e)

        chatWritePanel.getEditorPane().requestFocus();

-        smileyTextLabel.setText("");
+        clearMouseOverEffects(smileyItem, smiley);
    }

    /**
@ -195,6 +205,9 @@ public void paintComponent(Graphics g)
    {
    }

+    /**
+     * A custom menu item, which paints round border over selection.
+     */
    private class SmileyMenuItem extends JMenuItem
    {
        public SmileyMenuItem(Icon imageIcon)
@ -204,19 +217,35 @@ public SmileyMenuItem(Icon imageIcon)
        }
    }

+    /**
+     * Changes the static image of the underlying smiley with a dynamic one.
+     * Also shows the description and smiley string in the description area.
+     */
    public void mouseEntered(MouseEvent e)
    {
        JMenuItem smileyItem = (JMenuItem) e.getSource();

        Smiley smiley = smileysList.get(smileyItem);

-        smileyTextLabel.setText(smiley.getDescription()
-                + " - " + smiley.getSmileyStrings()[0]);
+        String smileyIconHtml = "<HTML><IMG SRC=\""
+            + ImageLoader.getSmiley(smiley.getDefaultString()).getImagePath()
+            + "\"></IMG></HTML>";
+        smileyItem.setIcon(null);
+        smileyItem.setText(smileyIconHtml);
+
+        smileyDescriptionLabel.setText(smiley.getDescription());
+        smileyTextLabel.setText(smiley.getSmileyStrings()[0]);
    }

+    /**
+     * Clears all mouse over effects when the mouse has exited the smiley area.
+     */
    public void mouseExited(MouseEvent e)
    {
-        smileyTextLabel.setText("");
+        JMenuItem smileyItem = (JMenuItem) e.getSource();
+        Smiley smiley = smileysList.get(smileyItem);
+
+        this.clearMouseOverEffects(smileyItem, smiley);
    }

    public void mouseClicked(MouseEvent e)
@ -227,4 +256,22 @@ public void mousePressed(MouseEvent e)

    public void mouseReleased(MouseEvent e)
    {}
+
+    /**
+     * Clears all mouse over effects for the given smiley item. This method
+     * should be invoked when the mouse has exited the smiley area or when
+     * a smiley has been selected and the popup menu is closed.
+     * 
+     * @param smileyItem the item for which we clear mouse over effects.
+     */
+    private void clearMouseOverEffects(JMenuItem smileyItem, Smiley smiley)
+    {
+        ImageIcon imageIcon =
+            new ImageIcon(ImageLoader.getImage(smiley.getImageID()));
+
+        smileyItem.setIcon(imageIcon);
+        smileyItem.setText(null);
+        smileyTextLabel.setText("");
+        smileyDescriptionLabel.setText("");
+    }
 }