From 9378c38d9a688614165b73f8f7ce76b01501aecd Mon Sep 17 00:00:00 2001
From: Yana Stamcheva <yana@jitsi.org>
Date: Thu, 27 Sep 2012 18:16:30 +0000
Subject: [PATCH] Fixes "Enter name of number" text being cut in the search
 field.

---
 .../images/impl/gui/common/searchIcon.png      | Bin 1533 -> 743 bytes
 .../gui/main/contactlist/SearchFieldUI.java    |  10 +++++-----
 .../util/swing/SIPCommTextField.java           |   1 +
 .../util/swing/plaf/SIPCommTextFieldUI.java    |   2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/resources/images/impl/gui/common/searchIcon.png b/resources/images/impl/gui/common/searchIcon.png
index 5d635cd0a863c37512edd8c2e3b0032ced92d3ab..013f601ba8fbcba10c3f042ebe8807905b3b5b46 100644
GIT binary patch
literal 743
zcmV<D0vP>?P)<h;3K|Lk000e1NJLTq000pH000pP1^@s6J8eh$00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyr8
z4mdlHD!k4B000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0006)Nkl<Z
zILoEeO>YuW6b9gT7`{V=L7mKKWeQU>F@_kEnno7pBqgxw#ud78LC9=e`VUNu8#k^X
z{R>V1fL%=Ku3FuYQevm!BQ?#`P_QtJP{0iuLWUaSS)Q9bx#zy;GUM?W|69)41`#O$
z?gNkjv;iCe*wZx4nujpIZ$d<F0IJ{be;5b^%!P%8o@H5X(=@&9c6&4$joxdTR=yHh
zTU&d%xVRWgBoeh$Ds>u-M!UUU&s8iIx$W)k$icyZ(Cv0#YnpaqI}Q=ujYJ}HB9W-7
zs#*l_6+p-5^Rel4`u5V&(n_IFa8xRl7XaSOA`So$MezyG^FNZw<Q{-806LTNA%MD~
zC?6C>`7Q_oM?@i8BpeQ3ce~w}vMhg|^L7`OWu1mXp`Ij3qAkL4+@)!nE&xC0B~Y)|
zSpZmGUS@3(K@bc83=yr`0Yv0HJ3G7Q^?C=Ys-D;)>+9<ugTbK1aojT^x-$bfSeAY6
z_xs)Pc>EjB^R0OiJ9l??pKfh!#mnWgXj#@ifC_*R!!WC&DEdTEY#D|zXfzt{G)*&Y
z_XNO=<Ktu6+}w<oN~K$!PRHkTIxhu5XcE!M;o%`ytyaUju3N+5@a;6j%>11IfCv44
z|E8|%K99#Uip64W07uPcQ_AP_kL)03&Ifb=xHj37i%HLA7zS-@Y^>C3HEtSm%t>?v
zpfv>mz<}rZom?*WNs^><S(d#l%f9-P&OcP2=lPv%HoGrL(s?G6sa-YB-^v5vF@OdD
Z{TC_j`^iHI@o@kE002ovPDHLkV1lqmKj{Df

literal 1533
zcmeAS@N?(olHy`uVBq!ia0vp^B0wz6!3HEJ^yqE{Qj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS=07?{&CLn2Bde0{8v^K<nQL2C3WatnaE85nHrD+&^mvr|hH
zl2X$%^K6yg@7}MZkeOnu6mIHk;9KCFnvv;IRg@ZB<rk7%m7Q#vqGWHUU{hfQG$1#%
zBvGLvHz%*ys=`(YY_1iM4HDK@QUEI{$+lI3I4Z(7K*2e`C{@8!&p<cXz|26w%uvtJ
z*u>o2Tt~skz|cV7z)0WFNY~KZ%Gk)tz(4^Clz_GsrKDK}xwt{?0`hE?GD=Dctn~HE
z%ggo3jrH=2()A53EiFN27#ZmTRp=I1=9MH?=;jqG!%T2VElw`VEGWs$&r<-In3$Ab
zT4JjNbScCOxdpzyaD(%Tp#cR9GX09g0)0b01O41wkiWpHi%Wu15zfG>x;Uh=AXPso
zwK%`DC>a<ZY05Coz_7z_5lA7>HCFybnZQU%%yG$2F3nBNEAe!(RRYTBrDUd9xw)9T
z85)|K7?>Lwm{}MaTAEu}I5}FnSQ<IG8CbeG!py*?*V)O%$<@Hn)xz8nsMFQZ(a_Mu
z(h_8dqp7p0xid_!XI^nhVqS78%-&3(y(Z4i#%^Y&20*>$IQ3dN7o{ea<QIkH=jXsu
zKtM)*Nq%ugeu08>u&IJ?Vsd64h!2V$h;Lm|i!#enQ{0O3a}~hhYn6$`esd#dV-pJ}
zQ$u5@zm3eC++1CZTuh9N%?%CQl%RT3$O$ujpkwqwi32IIz=VJ)5X6KheIN&(c~bL$
zIi?7hH9jo~+rq%Wr0eP87*cU-%@ps|LWvT`&s#ix(XlL9)o<owT@@!Ki^3DG99`?~
zY}sU{>vCs{&3%Oqv)m}nI@XWePY#uozq;bKC!kBbr@1ZD{rJi3|D59O0q!T*|Lrk8
zzvuJp?>o;puL)bd*m>5Y7YE#Oi+<JEnNRyIz|Xrd|3akRbm6BBN3Kp_T(t3ssnl8L
zwPD&XN_KT>bZt@Kc=fPgN6TL3Eqlx_y#Ky`ON0*J`s=rO*qX)5cGud>^qKOrX5QJf
z&DVlfrpWalU(fLNL|f10yIZ5y`W=w^SYg9|Jv`%x0gohCYu@dgZI4roR;~zJt^c52
zH(I3c@w^#6%i<dy9`J0BSGn=)B2(7RyYIeV;NN`n%%jI_kqa(n?D4z&<<85Jx_g_x
z3;o<<Ai*O%@4029!s$)LD)F7C@834t9;F);6{{z%$?c*MyV8T>d5X7o;NH0R^P<+y
zQ#>vknP4IFZ^iZ3u5-Rf#_jve@8dY>N%0opw;wC^DPM1{z15~A!sTx~vuAmXUh#?R
zmNlU#90ZPVb{%tQ&f9LCz5RCnMXRP9`9pbEUYEvO&D|#6eKdOU#g2s<S$!p63Qzeh
z4N8>mZQB^Oy0iP}qqAxn8xt)u7P4P{`9&=*B}D7$rH2K7{{H>-*KWRtirm{KA?szm
zQ|@QKw%Zf)dkV+R>0V3wW}j8t&ABW4md?V1qBByAMV>h8i2ZJf`_nlubaBM;|JM7K
z37JUs&hx(Dp>pYtd5UGQWB)?45Nno##eW487-GZzowUo;Jq{|6Jzf1=);T3K0RTKu
BLC^pI

diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/SearchFieldUI.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/SearchFieldUI.java
index 4e32a2445..99c947786 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/SearchFieldUI.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/SearchFieldUI.java
@@ -127,7 +127,7 @@ protected void customPaintBackground(Graphics g)
             int dy = (c.getY() + c.getHeight()) / 2
                 - searchIcon.getIconHeight()/2;
 
-            g2.drawImage(searchIcon.getImage(), 5, dy + 1, null);
+            g2.drawImage(searchIcon.getImage(), 3, dy + 1, null);
 
             if (c.getText() != null
                 && c.getText().length() > 0
@@ -171,11 +171,11 @@ protected Rectangle getVisibleEditorRect()
 
         if ((rect.width > 0) && (rect.height > 0))
         {
-            rect.x += searchIcon.getIconWidth() + 8;
-            rect.width -= searchIcon.getIconWidth() + 8;
+            rect.x += searchIcon.getIconWidth() + 5;
+            rect.width -= (searchIcon.getIconWidth() + 5);
 
-            if (isCallButtonEnabled)
-                rect.width -= callRolloverIcon.getWidth(null) + 12;
+            if (isCallIconVisible)
+                rect.width -= (callRolloverIcon.getWidth(null) + 12);
             else
                 rect.width -= 8;
 
diff --git a/src/net/java/sip/communicator/util/swing/SIPCommTextField.java b/src/net/java/sip/communicator/util/swing/SIPCommTextField.java
index 54c04f6ed..81f0f40c2 100644
--- a/src/net/java/sip/communicator/util/swing/SIPCommTextField.java
+++ b/src/net/java/sip/communicator/util/swing/SIPCommTextField.java
@@ -160,6 +160,7 @@ private void setDefaultText()
     {
         super.setText(defaultText);
         this.setForeground(defaultTextColor);
+        this.setCaretPosition(0);
     }
 
     /**
diff --git a/src/net/java/sip/communicator/util/swing/plaf/SIPCommTextFieldUI.java b/src/net/java/sip/communicator/util/swing/plaf/SIPCommTextFieldUI.java
index 1b1a6431c..9c48dc2b2 100644
--- a/src/net/java/sip/communicator/util/swing/plaf/SIPCommTextFieldUI.java
+++ b/src/net/java/sip/communicator/util/swing/plaf/SIPCommTextFieldUI.java
@@ -307,7 +307,7 @@ protected Rectangle getDeleteButtonRect()
      */
     protected Rectangle getVisibleEditorRect()
     {
-        if (!isDeleteButtonEnabled)
+        if (!isDeleteIconVisible)
         {
             return super.getVisibleEditorRect();
         }