Keep avatar ratio when showing it.

1 files changed, 21 insertions, 11 deletions

diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListCellRenderer.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListCellRenderer.java
index ee75211..5d444b8 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListCellRenderer.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactListCellRenderer.java
@@ -36,6 +36,9 @@ public class ContactListCellRenderer
     implements ListCellRenderer
 {
     private Logger logger = Logger.getLogger(ContactListCellRenderer.class);
+
+    private static final int AVATAR_HEIGHT = 30;
+
     private JLabel nameLabel = new JLabel();
 
     private JLabel photoLabel = new JLabel();
@@ -203,33 +206,40 @@ public class ContactListCellRenderer
      */
     private Image createRoundImage(byte[] avatarBytes)
     {
-        BufferedImage destImage
-            = new BufferedImage(25, 30, BufferedImage.TYPE_INT_ARGB);
-
-        BufferedImage avatarImage;
+        BufferedImage destImage = null;
 
         try
         {
             InputStream in = new ByteArrayInputStream(avatarBytes);
-            avatarImage = ImageIO.read(in);
+            BufferedImage avatarImage = ImageIO.read(in);
+
+            Image scaledImage = avatarImage.getScaledInstance(
+                                                            -1,
+                                                            AVATAR_HEIGHT,
+                                                            Image.SCALE_SMOOTH);
+
+            destImage
+                = new BufferedImage(scaledImage.getWidth(null),
+                                    AVATAR_HEIGHT,
+                                    BufferedImage.TYPE_INT_ARGB);
 
             Graphics2D g = destImage.createGraphics();
             AntialiasingManager.activateAntialiasing(g);
             g.setColor(Color.WHITE);
-            g.fillRoundRect(0, 0, 25, 30, 10, 10);
+            g.fillRoundRect(0, 0, 
+                            scaledImage.getWidth(null),
+                            AVATAR_HEIGHT,
+                            10, 10);
             g.setComposite(AlphaComposite.SrcIn);
 
-            g.drawImage(avatarImage
-                .getScaledInstance(25, 30, Image.SCALE_SMOOTH), 0, 0, null);
-
-            return destImage;
+            g.drawImage(scaledImage, 0, 0, null);
         }
         catch (Exception e)
         {
             logger.error("Could not create image.", e);
         }
 
-        return null;
+        return destImage;
     }
 
     /**