From 512b312cc185b215cfd53f5f6de4e41d5724e1b3 Mon Sep 17 00:00:00 2001
From: Jens Bache-Wiig <jbache@trolltech.com>
Date: Tue, 13 Apr 2010 12:07:00 +0200
Subject: [PATCH] Some minor modifications to fancylineedit

---
 src/libs/utils/fancylineedit.cpp            |   8 ++++----
 src/plugins/coreplugin/core.qrc             |   1 +
 src/plugins/coreplugin/images/editclear.png | Bin 0 -> 748 bytes
 3 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 src/plugins/coreplugin/images/editclear.png

diff --git a/src/libs/utils/fancylineedit.cpp b/src/libs/utils/fancylineedit.cpp
index 90afa176d36..75b79772eed 100644
--- a/src/libs/utils/fancylineedit.cpp
+++ b/src/libs/utils/fancylineedit.cpp
@@ -111,7 +111,7 @@ FancyLineEdit::FancyLineEdit(QWidget *parent) :
     QIcon icon = QIcon::fromTheme(layoutDirection() == Qt::LeftToRight ?
                      QLatin1String("edit-clear-locationbar-rtl") :
                      QLatin1String("edit-clear-locationbar-ltr"),
-                     QIcon::fromTheme("edit-clear", QIcon(QLatin1String("clear.png"))));
+                     QIcon::fromTheme("edit-clear", QIcon(QLatin1String(":/core/images/editclear.png"))));
 
     m_d->m_iconbutton->installEventFilter(m_d);
     m_d->m_iconbutton->setIcon(icon);
@@ -186,10 +186,10 @@ void FancyLineEdit::resizeEvent(QResizeEvent *)
         iconpos = (iconpos == Left ? Right : Left);
 
     if (iconpos == FancyLineEdit::Right) {
-        const int iconoffset = textMargins().right() + 8;
+        const int iconoffset = textMargins().right() + 4;
         m_d->m_iconbutton->setGeometry(contentRect.adjusted(width() - iconoffset, 0, 0, 0));
     } else {
-        const int iconoffset = textMargins().left() + 8;
+        const int iconoffset = textMargins().left() + 4;
         m_d->m_iconbutton->setGeometry(contentRect.adjusted(0, 0, -width() + iconoffset, 0));
     }
 }
@@ -274,7 +274,7 @@ void IconButton::paintEvent(QPaintEvent *)
     QPixmap iconpixmap = icon().pixmap(QSize(ICONBUTTON_SIZE, ICONBUTTON_SIZE),
                                        state, QIcon::Off);
     QRect pixmapRect = QRect(0, 0, iconpixmap.width(), iconpixmap.height());
-    pixmapRect.moveCenter(rect().center());
+    pixmapRect.moveCenter(rect().translated(0,-1).center());
 
     if (static_cast<FancyLineEdit*>(parentWidget())->autoHideIcon())
         painter.setOpacity(m_iconOpacity);
diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc
index 31b8174e7d6..84d8955c2f0 100644
--- a/src/plugins/coreplugin/core.qrc
+++ b/src/plugins/coreplugin/core.qrc
@@ -53,5 +53,6 @@
         <file>editormanager/BinFiles.mimetypes.xml</file>
         <file>images/progressbar.png</file>
         <file>images/help.png</file>
+        <file>images/editclear.png</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/coreplugin/images/editclear.png b/src/plugins/coreplugin/images/editclear.png
new file mode 100644
index 0000000000000000000000000000000000000000..7954c7d3c72315e10d4f2c8c121f805f19999439
GIT binary patch
literal 748
zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s77>k44ofy`glX=O&z`&N|
z?e4<x9|RZdT|SwCfq}EYBeIx*fm;}a85w5Hkzin8U@!6Xb!ETB!pp@V{_Xzjrwj~C
zIi4<#Ar`0CPB!$G2^4AFU-|y*n=|J$%$ncq3Qg%2eY3_Sjg?#a;5B=NvYS<j-rW<7
zVg>#;Cs`?HDCZbVoy5_7Xw%~ZA&mlMh4=SVW|kOouACGd_wMhGImLQ^k}da}Pn$k{
z`jnvAeUI00DvB|7E!wf^+PtTg{~kVi^yt(2hP2H)U+;RCz4S`c>s=g*6)X$3s-6F=
zAN9KY`Sa)R=a)VCoO=KJ{kFu2?nNC2Jet!_vp71e3_0}KrbWQ;!>X{=wXeVbp05rv
zMTF(x?3F85Mv1uQ<m4Dg^#*u7{B37!Y`kX8nu7ZJet|_PYikY7&A+d_|9&~wfzNx+
zDsYIMdTR9g_3NDc{K=`3zkmN`c=P6sfwgt_)@he72lp6qADiL(;1lPDXTR;%y}tCe
zEHXBBY1rzGyLWRt$Q)PkblQIVXlZQC{d60-^^6=0ORp??y-Q=M1YdiJmFy)G)xP9M
z7HYo1R&)6dKNMIh(!aTzfy=?GQ-DcRHBsWx?|<@j{{H^TOOHfZ&zu{Ruy*gJYe_wd
zJkGb?nqAGBs^aM}sU>Tx*Y3M&JkC9a5!oBB#rZP02F{U8z7Tae!(>H>77rV9)LOB%
zVciE49F_(xyqK|I>oE!EK#_D|>F3X%*J~_|v+5I$kB^_6D#^~yZqe5)z$b4%Z&IqH
zy1KfD=EbOb$zHeo>b-GVj8%K%qSjyU6?imNU{OhRb$3vgMwiCanol;*-@W5I|5>B!
z(eJ~D58wOv@#9B*&pkVL{)}0FeZQyXbKCRX^WA@Xnq<Gd{;^_Dc}2yKf9ub0*}8S>
zlgfL`1d@1<N0!LBnzdS9PX7Dw#fuk{{zuv~8tDJdP>&CN$iTqB;OXk;vd$@?2>{C5
BRFnV!

literal 0
HcmV?d00001