From 3ca45f81002426d029ff5e131590cc2cca682465 Mon Sep 17 00:00:00 2001
From: David Sansome <me@davidsansome.com>
Date: Sun, 15 Jul 2012 16:57:44 +0100
Subject: [PATCH] Make the new non-mac search fields look the same as the old
 LineEdit based search fields.

---
 3rdparty/qocoa/qsearchfield_nonmac.cpp |  18 +++++++++++-------
 data/Qocoa/qsearchfield_nonmac.png     | Bin 603 -> 0 bytes
 data/data.qrc                          |   1 -
 3 files changed, 11 insertions(+), 8 deletions(-)
 delete mode 100644 data/Qocoa/qsearchfield_nonmac.png

diff --git a/3rdparty/qocoa/qsearchfield_nonmac.cpp b/3rdparty/qocoa/qsearchfield_nonmac.cpp
index b3c47abac..f5d16157c 100644
--- a/3rdparty/qocoa/qsearchfield_nonmac.cpp
+++ b/3rdparty/qocoa/qsearchfield_nonmac.cpp
@@ -21,6 +21,7 @@ THE SOFTWARE.
 */
 
 #include "qsearchfield.h"
+#include "../../src/ui/iconloader.h"
 
 #include <QApplication>
 #include <QEvent>
@@ -62,19 +63,22 @@ QSearchField::QSearchField(QWidget *parent) : QWidget(parent)
     connect(lineEdit, SIGNAL(textChanged(QString)),
             this, SLOT(setText(QString)));
 
+    QIcon clearIcon(IconLoader::Load("edit-clear-locationbar-ltr"));
+
     QToolButton *clearButton = new QToolButton(this);
-    QPixmap clearIcon(QString(":/Qocoa/qsearchfield_nonmac.png"));
-    clearButton->setIcon(QIcon(clearIcon));
-    clearButton->setIconSize(clearIcon.size());
-    clearButton->setFixedSize(clearIcon.size());
-    clearButton->setStyleSheet("border: none;");
+    clearButton->setIcon(clearIcon);
+    clearButton->setIconSize(QSize(16, 16));
+    clearButton->setStyleSheet("border: none; padding: 0px;");
+    clearButton->resize(clearButton->sizeHint());
     connect(clearButton, SIGNAL(clicked()), this, SLOT(clear()));
 
     pimpl = new QSearchFieldPrivate(this, lineEdit, clearButton);
 
+    const int frame_width = lineEdit->style()->pixelMetric(QStyle::PM_DefaultFrameWidth);
+
     lineEdit->setStyleSheet(QString("QLineEdit { padding-left: %1px; } ").arg(clearButton->width()));
-    const int width = qMax(lineEdit->minimumSizeHint().width(), pimpl->clearButtonPaddedWidth());
-    const int height = qMax(lineEdit->minimumSizeHint().height(), pimpl->clearButtonPaddedHeight());
+    const int width = frame_width + qMax(lineEdit->minimumSizeHint().width(), pimpl->clearButtonPaddedWidth());
+    const int height = frame_width + qMax(lineEdit->minimumSizeHint().height(), pimpl->clearButtonPaddedHeight());
     lineEdit->setMinimumSize(width, height);
 
     QVBoxLayout *layout = new QVBoxLayout(this);
diff --git a/data/Qocoa/qsearchfield_nonmac.png b/data/Qocoa/qsearchfield_nonmac.png
deleted file mode 100644
index bcbc5fd51abd1911aa3583d3c60b20f66cf95420..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 603
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1H_qX3@}SD>Jk
zlNFHEG138&3JMB9QdCq3NV2lB+S=Iw8Mb!T$;rt;1|uV*fuTMV6O)Rn3XqhL5NBaw
z;pOE8iUYYoHc$&28yh=2I|l~`4-XGeN<ctBL_}CbL_|_j5@@)hlA@B5lDfK@zJZ>h
zp`nqnp}D!am6a9H3VVBdM<8&rcX4%gb#--jclQDUZx3&8Z(l!eKOpe;4G0Jb4h{|p
z2?+}e4GRy6hzyI2jEs(sPDx2lNlQx0NXf{^$O3}w^uofz($dn(%F3#$s+N|Pwzjse
zuC56aCd{8df6baT>(;H?v}xn^9or8cJb2{jkz>b>oxgDY%9Shk?%jL%@Zt04&tJZL
z`RdiHw{PEm`0(NL=g(iheEIe3*YDrI|NQyG>}vM_6c!~xe!&b5&u*lFI7!~_E({&4
zvK~MVXMsm#F;Hwb2s2u}dHe_{$X?><>&kwIosU=9s(aOgaG=msPZ!4!iOb0e3d{vB
zof!Ci91dSSd;9R^)7JwTv=(H^&Uo_p#dMJbT^7NBEgjyzTwXqXB?f|w+#atZRhKMN
zala`s`(<|{%aN&9{{#mG|J}N^^oz;Q1|}gPv5OxKKL)ySeJWa{AUa7)aO1*li5nkI
z3ObZvykyH9r#C!0&Ad}t6t|t2aeMa;>)W$eeRjTkP@9|a&XFo!hJZNf)b&ebqk#@&
N@O1TaS?83{1OVSX&$Ivl

diff --git a/data/data.qrc b/data/data.qrc
index 9200f6bde..91bbd7ec9 100644
--- a/data/data.qrc
+++ b/data/data.qrc
@@ -291,7 +291,6 @@
         <file>providers/songkick.png</file>
         <file>providers/twitter.png</file>
         <file>providers/wikipedia.png</file>
-        <file>Qocoa/qsearchfield_nonmac.png</file>
         <file>sample.mood</file>
         <file>schema/device-schema.sql</file>
         <file>schema/jamendo.sql</file>