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

List:       kde-commits
Subject:    KDE/kdeplasma-addons/applets/nowplaying
From:       Tony Neal Murray <murraytony () gmail ! com>
Date:       2008-12-13 18:29:15
Message-ID: 1229192955.203547.5700.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 896529 by murrant:

Make nowplaying size itself better in a vertical panel too.
Also removing kDebugs from constraintsEvent.


 M  +12 -25    nowplaying.cpp  


--- trunk/KDE/kdeplasma-addons/applets/nowplaying/nowplaying.cpp #896528:896529
@@ -175,10 +175,6 @@
 
 void NowPlaying::constraintsEvent(Plasma::Constraints constraints)
 {
-    kDebug() << "Constraints:" << constraints;
-    kDebug() << "Maximum size:" << maximumSize();
-    kDebug() << "Preferred size:" << preferredSize();
-    kDebug() << "Minimum size:" << minimumSize();
     if (constraints & Plasma::FormFactorConstraint)
     {
         switch (formFactor())
@@ -195,29 +191,20 @@
         }
     }
 
-    if (constraints & Plasma::SizeConstraint && formFactor() == Plasma::Horizontal)
+    if (constraints & Plasma::SizeConstraint)
     {
-        setPreferredSize(contentsRect().height() * 2, contentsRect().height());
-//        setAspectRatioMode(Plasma::KeepAspectRatio);
+        switch (formFactor())
+        {
+            case Plasma::Horizontal:
+                setPreferredSize(contentsRect().height() * 2, contentsRect().height());
+                break;
+            case Plasma::Vertical:
+                setPreferredSize(contentsRect().width(), contentsRect().width() / 2);
+                break;
+            default:
+                break;
+        }
     }
-
-        kDebug() << "minimumSize():" << minimumSize();
-        kDebug() << "preferredSize():" << preferredSize();
-        kDebug() << "maximumSize():" << maximumSize();
-        QSizePolicy policy(sizePolicy());
-        qreal left, top, right, bottom;
-        getContentsMargins(&left, &top, &right, &bottom);
-        kDebug() << "sizePolicy():"
-                 << "\n    horizontalPolicy:" << policy.horizontalPolicy()
-                 << "\n    horizontalStretch:" << policy.horizontalStretch()
-                 << "\n    verticalPolicy:" << policy.verticalPolicy()
-                 << "\n    verticalStretch:" << policy.verticalStretch()
-                 << "\n    expandingDirections:" << policy.expandingDirections()
-                 << "\n    hasHeightForWidth:" << policy.hasHeightForWidth()
-                 << "\n    contentsMargins:" << left << top << right << bottom;
-        kDebug() << "backgroundHints():" << backgroundHints();
-        kDebug() << "contentsRect():" << contentsRect();
-        kDebug() << "boundingRect():" << boundingRect();
 }
 
 void NowPlaying::dataUpdated(const QString &name,
[prev in list] [next in list] [prev in thread] [next in thread]