From f5b91c58de34a21129ced8f4d1ae39eb0450871c Mon Sep 17 00:00:00 2001
From: Aaron Seigo <aseigo@kde.org>
Date: Wed, 3 Aug 2011 16:44:37 +0200
Subject: [PATCH] consolidate creation code; use the layout; don't hide dialog
 if already hidden

fixes a few annoyances in the system tray
---
 popupapplet.cpp         | 71 +++++++++++++++++++----------------------
 private/popupapplet_p.h |  1 +
 2 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/popupapplet.cpp b/popupapplet.cpp
index 759ea7fc9..c1ed41fdb 100644
--- a/popupapplet.cpp
+++ b/popupapplet.cpp
@@ -86,58 +86,35 @@ void PopupApplet::setPopupIcon(const QIcon &icon)
         return;
     }
 
-    if (!d->icon) {
-        d->icon = new Plasma::IconWidget(icon, QString(), this);
-        connect(d->icon, SIGNAL(clicked()), this, SLOT(internalTogglePopup()));
-
-        QGraphicsLinearLayout *layout = new QGraphicsLinearLayout();
-        layout->setContentsMargins(0, 0, 0, 0);
-        layout->setSpacing(0);
-        layout->setOrientation(Qt::Horizontal);
-
-        setLayout(layout);
-    } else {
-        d->icon->setIcon(icon);
-    }
+    d->createIconWidget();
+    d->icon->setIcon(icon);
 }
 
 void PopupApplet::setPopupIcon(const QString &iconName)
 {
+    // Attempt 1: is it in the plasmoid package?
     if (package()) {
-        //Attempt1: is it in the plasmoid package?
         const QString file = package()->filePath("images", iconName);
         if (!file.isEmpty()) {
             setPopupIcon(KIcon(file));
             return;
         }
-    //Attempt2: is it a svg in the icons directory?
     }
+
+    // Attempt 2: is it a svg in the icons directory?
     QString name = QString("icons/") + iconName.split("-").first();
     if (!Plasma::Theme::defaultTheme()->imagePath(name).isEmpty()) {
-        if (!d->icon) {
-            d->icon = new Plasma::IconWidget(this);
-            d->icon->setSvg(name, iconName);
-            if (d->icon->svg().isEmpty()) {
-                setPopupIcon(KIcon(iconName));
-            }
-            connect(d->icon, SIGNAL(clicked()), this, SLOT(internalTogglePopup()));
-
-            QGraphicsLinearLayout *layout = new QGraphicsLinearLayout();
-            layout->setContentsMargins(0, 0, 0, 0);
-            layout->setSpacing(0);
-            layout->setOrientation(Qt::Horizontal);
-
-            setLayout(layout);
-        } else {
-            d->icon->setSvg(name, iconName);
-            if (d->icon->svg().isEmpty()) {
-                setPopupIcon(KIcon(iconName));
-            }
+        d->createIconWidget();
+        d->icon->setSvg(name, iconName);
+        if (d->icon->svg().isEmpty()) {
+            setPopupIcon(KIcon(iconName));
         }
-    // Final Attempt: use KIcon
-    } else {
-        setPopupIcon(KIcon(iconName));
+
+        return;
     }
+
+    // Final Attempt: use KIcon
+    setPopupIcon(KIcon(iconName));
 }
 
 QIcon PopupApplet::popupIcon() const
@@ -625,7 +602,7 @@ void PopupApplet::hidePopup()
     d->delayedShowTimer.stop();
 
     Dialog *dialog = d->dialogPtr.data();
-    if (dialog) {
+    if (dialog && dialog->isVisible()) {
         if (location() != Floating) {
             dialog->animatedHide(locationToInverseDirection(location()));
         } else {
@@ -832,6 +809,24 @@ void PopupAppletPrivate::statusChangeWhileShown(Plasma::ItemStatus status)
     preShowStatus = status;
 }
 
+void PopupAppletPrivate::createIconWidget()
+{
+    if (icon) {
+        return;
+    }
+
+    icon = new Plasma::IconWidget(q);
+    QObject::connect(icon, SIGNAL(clicked()), q, SLOT(internalTogglePopup()));
+
+    QGraphicsLinearLayout *layout = new QGraphicsLinearLayout();
+    layout->setContentsMargins(0, 0, 0, 0);
+    layout->setSpacing(0);
+    layout->setOrientation(Qt::Horizontal);
+    layout->addItem(icon);
+    layout->setAlignment(icon, Qt::AlignCenter);
+    q->setLayout(layout);
+}
+
 void PopupAppletPrivate::restoreDialogSize()
 {
     Plasma::Dialog *dialog = dialogPtr.data();
diff --git a/private/popupapplet_p.h b/private/popupapplet_p.h
index 63253d61d..2a3aa4402 100644
--- a/private/popupapplet_p.h
+++ b/private/popupapplet_p.h
@@ -47,6 +47,7 @@ public:
     KConfigGroup popupConfigGroup();
     void appletActivated();
     void statusChangeWhileShown(Plasma::ItemStatus status);
+    void createIconWidget();
 
 
     PopupApplet *q;