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

List:       kde-commits
Subject:    playground/libs/popupdropper/popupdropper
From:       Jeff Mitchell <kde-dev () emailgoeshere ! com>
Date:       2008-06-30 21:54:27
Message-ID: 1214862867.189911.20686.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 826532 by mitchell:

Fix submenus inheriting wrong colors


 M  +10 -2     PopupDropper.cpp  


--- trunk/playground/libs/popupdropper/popupdropper/PopupDropper.cpp #826531:826532
@@ -258,6 +258,7 @@
     d->overlayLevel = old_d->overlayLevel + 1;
 }
 
+//note: does not set default colors, should have done that when creating submenu
 void PopupDropper::addOverlay( PopupDropperPrivate* newD )
 {
     //qDebug() << "right before push, m_viewStack.size() is " << m_viewStack.size();
@@ -265,7 +266,6 @@
     //qDebug() << "right after push, m_viewStack.size() is " << m_viewStack.size();
     PopupDropperPrivate* old_d = d;
     d = newD;
-    setColors( d->windowColor, d->baseTextColor, d->hoveredTextColor, \
d->hoveredBorderColor );  d->sharedRenderer = old_d->sharedRenderer;
     d->quitOnDragLeave = true;
     d->overlayLevel = old_d->overlayLevel + 1;
@@ -311,8 +311,16 @@
 PopupDropperItem* PopupDropper::addSubmenu( PopupDropper** pd, QSvgRenderer \
*renderer, const QString &elementId, const QString &text )  {
     //qDebug() << "addSubmenu, this is " << this << " and passed-in PopupDropper is \
                " << (*pd);
-    if( !(*pd) || !renderer )
+    if( !(*pd) )
+    {
+        qWarning() << "Did not pass in a valid PUD!";
         return 0;
+    }
+    else if( !renderer )
+    {
+        qWarning() << "Did not pass in a valid renderer!";
+        return 0;
+    }
     PopupDropperPrivate* newD = (*pd)->d;
     newD->submenu = true;
     newD->widget = d->widget;


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