[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdelibs/frameworks] plasma: allow popups to be freely resized when
From:       Aaron Seigo <aseigo () kde ! org>
Date:       2011-08-08 12:49:54
Message-ID: 20110808124954.81371A60AE () git ! kde ! org
[Download RAW message or body]

Git commit d9b9487591942839ca2aa3034716d1b544e70417 by Aaron Seigo.
Committed on 08/08/2011 at 14:42.
Pushed by aseigo into branch 'frameworks'.

allow popups to be freely resized when they aren't the applet

M  +6    -2    plasma/popupapplet.cpp

http://commits.kde.org/kdelibs/d9b9487591942839ca2aa3034716d1b544e70417

diff --git a/plasma/popupapplet.cpp b/plasma/popupapplet.cpp
index c1ed41f..d6e3106 100644
--- a/plasma/popupapplet.cpp
+++ b/plasma/popupapplet.cpp
@@ -372,7 +372,9 @@ void PopupAppletPrivate::popupConstraintsEvent(Plasma::Constraints constraints)
                 dialog->d->appletPtr = q;
                 dialogPtr = dialog;
 
-                dialog->setAspectRatioMode(savedAspectRatio);
+                if (icon) {
+                    dialog->setAspectRatioMode(savedAspectRatio);
+                }
 
                 //no longer use Qt::Popup since that seems to cause a lot of problem when you drag
                 //stuff out of your Dialog (extenders). Monitor WindowDeactivate events so we can
@@ -736,7 +738,9 @@ void PopupAppletPrivate::internalTogglePopup()
         KWindowSystem::setOnAllDesktops(dialog->winId(), true);
         KWindowSystem::setState(dialog->winId(), NET::SkipTaskbar | NET::SkipPager);
 
-        dialog->setAspectRatioMode(savedAspectRatio);
+        if (icon) {
+            dialog->setAspectRatioMode(savedAspectRatio);
+        }
 
         if (q->location() != Floating) {
             dialog->animatedShow(locationToDirection(q->location()));

[prev in list] [next in list] [prev in thread] [next in thread]