From 38ab27d842124ec0c43baf6f9c9401834c1121bf Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Mon, 22 Dec 2008 20:32:37 +0000
Subject: [PATCH] applets without an icon can have their own aspect ratio
 (clocks :))

svn path=/trunk/KDE/kdelibs/; revision=900421
---
 popupapplet.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/popupapplet.cpp b/popupapplet.cpp
index 686f36c9e..b34216715 100644
--- a/popupapplet.cpp
+++ b/popupapplet.cpp
@@ -64,6 +64,7 @@ void PopupApplet::setPopupIcon(const QIcon &icon)
             delete d->icon;
             d->icon = 0;
             setLayout(0);
+            setAspectRatioMode(d->savedAspectRatio);
         }
         return;
     }
@@ -255,10 +256,10 @@ void PopupAppletPrivate::popupConstraintsEvent(Plasma::Constraints constraints)
             kDebug() << "about to switch to a popup";
             //save the aspect ratio mode in case we drag'n drop in the Desktop later
             savedAspectRatio = q->aspectRatioMode();
-            q->setAspectRatioMode(Plasma::ConstrainedSquare);
 
             if (icon) {
                 icon->show();
+                q->setAspectRatioMode(Plasma::ConstrainedSquare);
             }
 
             if (proxy) {