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
zcmV<I0u%j-P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igP;
z3IG@O-|OW700L}DL_t(I%dL|!OB_)Yg}-_4&Fsw1C^m!ax>aP073{1uW(5ly!PY+@
zcG-GiON)>)T@e3+Vmc#eBWy60k_d~!vg5#1fe?0a-@JKgbTJ93l3QNx{kWWSF8pIT
zzc-ebmzR`Mn~vkG2_Y5%ilVr()}G~g{^8={;_|P6X0y5Ly6$VG)Pn1}2qAa`ptUB?
z^DkQKcjxEl@1J($^JU-n--cmWi=v1y3@Mk(1VKQlRKoK-gb*?Cs#dFg>-YPgCxB+N
zxfBG!o2jX(S`<ZWY-}(ZjZjMA`#v)>GpwwvaDRV~5TazQeK9vT_o?6SrwYLHyv-m8
z7Ru!^>+9=mZ*P-j8T<SD0PO7SFgrVowU*P<Q;abS#+Xgu@(Hl!`#!Gg((QIxU0tPC
ztFgPg3qTylBuPTI+r@QVeBWn09<Koi0HxHT>$)hV7!HSYIvvt9C5~g_I3`U~I-L%~
z;Si-1kF$#a3P4JU5CSPBVHo23{vUo%PfsJI#9BL<om^n8y|UI~j3Ep|+U+*gYLz5O
zNRotVwMx6)CJaN2F<5J{)?Q5jMNym?W6)aDXf&u)Dhvh#TCEnXR*S)4K&4Wl(P*Hx
z#u!6U6lW6~=jZ2tD5YLHjuT&BUz24S2L}f@j)M>mA3vUwWf><YCrByLT7MahMsIt)
zUMc~4y<S?c*NqV3l@OwIdwYvgiYSUGm3;C%=kD$f&+{mX;`_tH!`|`n@$oN7yt%pg
zT(8%^Nh#+&&x@Z&`AIZu?bq>mymxqb`2MfYw6(Rh<ayqv5Mm9-S#%ynHibFUWBuXi
e=;)IFSw8_VFZ*aGUsd4%0000<MNUMnLSTZ*+f<YQ
literal 0
HcmV?d00001
--
GitLab