From 83b0cc751b110a8b9646b5eb86a659ca75451447 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Wed, 2 Feb 2011 17:17:20 +0100
Subject: [PATCH] new icons for lookup sorting

---
 platform/icons/src/ide/lookupAlphanumeric.png   | Bin 316 -> 338 bytes
 platform/icons/src/ide/lookupRelevance.png      | Bin 462 -> 348 bytes
 .../codeInsight/lookup/impl/LookupImpl.java     |  13 +++++++------
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/platform/icons/src/ide/lookupAlphanumeric.png b/platform/icons/src/ide/lookupAlphanumeric.png
index 55222644f54a352fb99281933e9bc678eb0db17c..12ace9cae967429c72fbaf5a601800b9a44db4bb 100644
GIT binary patch
delta 311
zcmV-70m%Nm0@4DIB!3xnMObuGZ)S9NVRB^vL1b@YWgtmyVP|DhWnpA_ami&o0002=
zNkl<Zc-oYby^R7f5QWF+I-rS#3N9hHD1e%XoKOTQ;RWP(6#y9>kh1pt-Lr2Oaas~A
zJ^#pl^S)VaaCdrVe2kmb_C)tSQ=fBPKXWeBm;93p6Ejo4-+%l!s2Z6Wso4VSw|YJM
z5(H;^qL_^vQEh@T!f>s^<LKt}O#Lvh2#IJ=l?2nyAfzQE1xNDK08W@XmX`EYHDGox
zkqWowVoOrFp!&s3t0DSJL*Y<ZlCU62O{-dhCtQb#Av1Ra)*8Lcfiy?TdZ^w_dng=>
zwCYDRepA&Oa4?R;b(|te!#RjxM&tVTWf(d@X?z#n{WX3C7y!v!^}U7Lx#s`?002ov
JPDHLkV1lZOi|+sc

delta 289
zcmcb_w1;VeN<Cw7kh>GZx^prw85kJYlDyqr82*Fcg1yTp14TFsJR*x37`TN&n2}-D
z90{Nxdx@v7EBkFGMotx_SdN!1Kq1Kz*N775{M_8syb=cIqSVBa)D(sC%#sWRcTeAd
z@J2pyprYxXE{-7@=Z{{n<zq~gV0n<9yQzMui<7E`h*BZbTBo%aG*qPaYFKpSEG}SK
zUcj(!!KKwECh>~%d*`1DnS9cEW@UT5;=vE%hb7#n>@%HH;J#hM>KKPFPk`(H;P0^y
zE>E~rovx8ATG6Hb>3Oq>k<SGu)?5>(rMh`sVG$1mR;AonAos8GAkS;2+J0}HYXxrV
jQF@1^j8x7|v|%V~7k)JJ&W9SHBN;qh{an^LB{Ts5QLbp!

diff --git a/platform/icons/src/ide/lookupRelevance.png b/platform/icons/src/ide/lookupRelevance.png
index f04f37a0c9e9d2ee1e0d6b6d46470e3a3b81c052..825af769c9a93ae3417c7835258549420e8f3c82 100644
GIT binary patch
delta 321
zcmV-H0lxmu1Ka|TB!3xnMObuGZ)S9NVRB^vL1b@YWgtmyVP|DhWnpA_ami&o0002~
zNkl<Zc-oXwp-uxq6x=ISBsHW^g>KVeP-ud}kl-t@d_i@8psKpxazD^u2ogjq5SU&<
zZ@cf!dz}>(&DGpqF0;AJyqS5q!reog(+Mq4YeDyT8PB%&?tfN7)1_+cN{S*<6L$r1
zQ!SrvPaH^`@qGj2&VXMt^xQDzklM{g4F{1p3Bf9o9~3DXWDnE6nQq<j-w>$ORo)mU
z4@v%0-DlT6px^w~>>#NQo*%<2Cx4I}fOJFg4@FHul3fVykIekS81I=x@)d;_#N5?R
zO4H$*+n5tODmrlmMp8{{F5#I2%5xoZ&=nm%xs@+-<UR{V91!iuE86}V2LT2EXM5O+
TU>UM)00000NkvXXu0mjfdWVhV

delta 436
zcmV;l0Zabe0?q@FB!2;OQb$4nuFf3k00006VoOIv0RI600RN!9r;`8x010qNS#tmY
z3ljhU3ljkVnw%H_000McNliru+X4XzB?@t-a6bS502y>eSad^gZEa<4bO1wgWnpw>
zWFU8GbZ8()Nlj2!fese{00AjUL_t(2&$ZC8YQj(y#_@j=^nXeU7oo`%1xW_QNq6HQ
z6qn*7I1~!f2dJZSp=+nEd4UdHT)K5AICOK!&_M{?p;&^22+i%HDVBEV(6gNbKhF6M
z{AYE$U5tG*91e{nNy044!aUElQcC&0Z)`T3*Y$e+QLoqC#bR+=Xy5lQg%D5Wa`_Fo
zt5hm;Km$wLwtw$ColbDDuHWyU0(hP`2hds{0lHKwozG@76QI><73UPtah!)85Ib=8
zW1#VP3_uVBFTa7oVDJT+&8Cc^$gWna&)<R8nlKDU0OlT~X}X+DCf8ERM*zbxG9d((
zWtqKR?_{-F<p9<mNGXrC))%hpj+9dG0F6c?*>1NtrY&h&aU5S2=hSMogFMsely<v)
eFe^Uv*ZKsPdt)@|6sa!&0000<MNUMnLSTZfrndqB

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
index be6be623b388..bec42fbd1224 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
@@ -146,7 +146,7 @@ public class LookupImpl extends LightweightHint implements Lookup, Disposable {
     getComponent().add(myScrollPane, BorderLayout.NORTH);
     myScrollPane.setBorder(null);
 
-    myAdComponent = HintUtil.createAdComponent(null);
+    myAdComponent = HintUtil.createAdComponent(null, new EmptyBorder(1, 2, 1, 2 + relevanceSortIcon.getIconWidth()));
     getComponent().add(myAdComponent, BorderLayout.SOUTH);
     getComponent().setBorder(new BegPopupMenuBorder());
 
@@ -162,7 +162,7 @@ public class LookupImpl extends LightweightHint implements Lookup, Disposable {
     addListeners();
 
     mySortingLabel = new JLabel();
-    mySortingLabel.setBorder(new LineBorder(Color.DARK_GRAY));
+    mySortingLabel.setBorder(new LineBorder(Color.LIGHT_GRAY));
     mySortingLabel.setOpaque(true);
     mySortingLabel.addMouseListener(new MouseAdapter() {
       @Override
@@ -1112,14 +1112,15 @@ public class LookupImpl extends LightweightHint implements Lookup, Disposable {
 
   private void layoutStatusIcons() {
     final JLayeredPane layeredPane = getComponent().getRootPane().getLayeredPane();
-    final int width = layeredPane.getWidth();
-    final int height = layeredPane.getHeight();
 
     final Dimension iconSize = myProcessIcon.getPreferredSize();
-    myIconPanel.setBounds(width - iconSize.width, 0, iconSize.width, iconSize.height);
+    myIconPanel.setBounds(layeredPane.getWidth() - iconSize.width, 0, iconSize.width, iconSize.height);
 
     final Dimension sortSize = mySortingLabel.getPreferredSize();
-    mySortingLabel.setBounds(width - sortSize.width, height - sortSize.height, sortSize.width, sortSize.height);
+    final Point sbLocation = SwingUtilities.convertPoint(myScrollPane.getVerticalScrollBar(), 0, 0, layeredPane);
+
+    final int sortHeight = (StringUtil.isNotEmpty(myAdText) ? myAdComponent : mySortingLabel).getPreferredSize().height;
+    mySortingLabel.setBounds(sbLocation.x, layeredPane.getHeight() - sortHeight, sortSize.width, sortHeight);
 
   }