From 2a5c6ecfa1373615c71f96d712efe639a98ecb7c Mon Sep 17 00:00:00 2001
From: David Rosca <nowrep@gmail.com>
Date: Sun, 24 Jan 2016 13:03:16 +0100
Subject: [PATCH] ClickableLabel: Fix resizing icon with label

---
 src/lib/tools/clickablelabel.cpp | 40 +++++++++++++++++++++-----------
 src/lib/tools/clickablelabel.h   |  6 ++++-
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/src/lib/tools/clickablelabel.cpp b/src/lib/tools/clickablelabel.cpp
index 91b4856a3..3a1aaa106 100644
--- a/src/lib/tools/clickablelabel.cpp
+++ b/src/lib/tools/clickablelabel.cpp
@@ -24,32 +24,46 @@ ClickableLabel::ClickableLabel(QWidget* parent)
 {
 }
 
+QString ClickableLabel::themeIcon() const
+{
+    return m_themeIcon;
+}
+
 void ClickableLabel::setThemeIcon(const QString &name)
 {
-    QIcon icon = QIcon::fromTheme(name);
-
-    if (!icon.isNull()) {
-        adjustSize();
-        setPixmap(icon.pixmap(size()));
-    }
+    m_themeIcon = name;
+    updateIcon();
 }
 
 QIcon ClickableLabel::fallbackIcon() const
 {
-    return pixmap() ? QIcon(*pixmap()) : QIcon();
+    return m_fallbackIcon;
 }
 
-void ClickableLabel::setFallbackIcon(const QIcon &image)
+void ClickableLabel::setFallbackIcon(const QIcon &fallbackIcon)
 {
-    if (!pixmap() || pixmap()->isNull()) {
-        adjustSize();
-        setPixmap(image.pixmap(size()));
+    m_fallbackIcon = fallbackIcon;
+    updateIcon();
+}
+
+void ClickableLabel::updateIcon()
+{
+    if (!m_themeIcon.isEmpty()) {
+        const QIcon icon = QIcon::fromTheme(m_themeIcon);
+        if (!icon.isNull()) {
+            setPixmap(icon.pixmap(size()));
+            return;
+        }
     }
+
+    if (!m_fallbackIcon.isNull())
+        setPixmap(m_fallbackIcon.pixmap(size()));
 }
 
-QString ClickableLabel::themeIcon() const
+void ClickableLabel::resizeEvent(QResizeEvent *ev)
 {
-    return m_themeIcon;
+    QLabel::resizeEvent(ev);
+    updateIcon();
 }
 
 void ClickableLabel::mouseReleaseEvent(QMouseEvent* ev)
diff --git a/src/lib/tools/clickablelabel.h b/src/lib/tools/clickablelabel.h
index a3309f03d..1051f10b7 100644
--- a/src/lib/tools/clickablelabel.h
+++ b/src/lib/tools/clickablelabel.h
@@ -41,16 +41,20 @@ public:
     void setThemeIcon(const QString &name);
 
     QIcon fallbackIcon() const;
-    void setFallbackIcon(const QIcon &image);
+    void setFallbackIcon(const QIcon &fallbackIcon);
 
 signals:
     void clicked(QPoint);
     void middleClicked(QPoint);
 
 private:
+    void updateIcon();
+
+    void resizeEvent(QResizeEvent *ev);
     void mouseReleaseEvent(QMouseEvent* ev);
 
     QString m_themeIcon;
+    QIcon m_fallbackIcon;
 
 };