From a77cd8bd786992d047d412efb368dbf0e1ad01ef Mon Sep 17 00:00:00 2001
From: Sebastien Mazy <sebastien@mazy.eu>
Date: Sun, 15 Feb 2009 22:56:49 +0000
Subject: [PATCH] expand/fold contact group with single click

Also make arrow images the same size to prevent the group name from
moving on expand/fold.
---
 .../images/impl/gui/common/downArrow.png      | Bin 227 -> 230 bytes
 .../images/impl/gui/common/rightArrow.png     | Bin 238 -> 246 bytes
 .../gui/main/contactlist/ContactList.java     |  18 +++++-------------
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/resources/images/impl/gui/common/downArrow.png b/resources/images/impl/gui/common/downArrow.png
index 455f3ab3a0979bab212f3fb6d82f7276bf608454..bbc5d6f95373c64a7e7a6092054a0738b47698e0 100644
GIT binary patch
delta 195
zcmaFN_>6IaxF!b&8v_Hw5&nJMK#H+A$lZxy-8q?;Kn`1yx4R3&e-K=-clqRrh7$Gc
zC7!;n>^GVC#neShzUtZnRi$~lIEF}EUV3^XCsUvV%fs{6n?!FMitp+am569rn85rk
zxoGC?mN_%H)TY}STe=t&ButW>Ca<&VRg>zk>2>)L$%kGY=A1q4NtbNi=I0%`lQud|
vGVZH*)L1)-@yosYVOLkK;`{uzK8|meuGAC$uiH3)Rx)_H`njxgN@xNA_99K2

delta 192
zcmaFH_?U5mxD+b~8v_GF#l*FtK#HZ<$uool2x>S|Iwm?u)JvAQMwA5Sr<If^7Ns(j
zmzV2h=4BTrCl;jY<rk&TerF>E)Ro}r;uyj)GxhXF&O-?jY!8puv#J-g=8H(Hdps1F
z*2KM|-`DECs?(9M4W8d`dtPYH=F1BXEzi05_jAsT<b&^yv$ju5IV9MB)iT+`$lRmo
sFl+vv0xzScd%v$sui6!MweqfAuAr{e!u^L5fR-_My85}Sb4q9e05};*{{R30

diff --git a/resources/images/impl/gui/common/rightArrow.png b/resources/images/impl/gui/common/rightArrow.png
index 4c4882d05e2d664abded4691740202e664a7ca99..615d12a24f66f9ad6e3e9524d3812767900b57dd 100644
GIT binary patch
delta 232
zcmaFI_>Iw_Gr-TCmrII^fq{Y7)59eQNOOQN2OE$)!oRN@NHG=%xjQkeJ16rJ$YD$J
zc6VX;4}uH!E}uNnP@<l_#M9T6{U#H?m<I0y#+6Hes>(cF977~7m!93o$rLEi^6>m+
zCZE>q17C78#KRJ_t~c)7m>bbNvGd`xV@(T9Z6;S2$lN(#aQK5hx0mMnAg}oBt9P#S
z?mVol#FzF;t+v0~WzIB)7lqv&uZ0-0bEY@w>&>*>l4$&lD}RphXG{6L83*`}pZRm<
b|6j&O^|Ec!o468zPGInK^>bP0l+XkK7fM&v

delta 224
zcmeyy_>R%AGr-TCmrII^fq{Y7)59eQNV5Vl2L~IFH2i344Ww9#ojgN0fS`sWrDLLl
zM7?B*YeY$Kep*R+Vo@qXd3m{BW?pu2a$-TMUVc&f>~}U&Kwa6ME{-7_GegfT<YjUc
zX?fWHl<UBxIj#xcJ$Ef&dQ;kTIDo};fx(IA7gap6BF^MC*w5_wnSLee{nl$6w=P?r
z(3|b@=FF6x+jqDeVPuPUo1>Hz{Acr#SJ!JE&QP2AoRQncAobbW`h6SEpGluz!;rH|
VHt|O{(-xq;44$rjF6*2UngIOzRyqIx

diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactList.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactList.java
index 0bbb013ce..b91f8e105 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactList.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactList.java
@@ -588,19 +588,6 @@ public void mouseClicked(MouseEvent e)
         {
             MetaContactGroup group = (MetaContactGroup) selectedValue;
 
-            // Closes or opens a group on a double click.
-            if (e.getClickCount() > 1)
-            {
-                if (listModel.isGroupClosed(group))
-                {
-                    listModel.openGroup(group);
-                }
-                else
-                {
-                    listModel.closeGroup(group);
-                }
-            }
-
             if ((e.getModifiers() & InputEvent.BUTTON3_MASK) != 0
                 || (e.isControlDown() && !e.isMetaDown()))
             {
@@ -619,6 +606,11 @@ public void mouseClicked(MouseEvent e)
             }
             else if ((e.getModifiers() & InputEvent.BUTTON1_MASK) != 0)
             {
+                if (listModel.isGroupClosed(group))
+                    listModel.openGroup(group);
+                else
+                    listModel.closeGroup(group);
+
                 fireContactListEvent(   group,
                                         ContactListEvent.GROUP_SELECTED,
                                         e.getClickCount());