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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/generic/applets/systemtray/ui
From:       Marco Martin <notmart () gmail ! com>
Date:       2010-01-31 21:48:34
Message-ID: 1264974514.913437.27194.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1083239 by mart:

-don't show the stack if the full view is open when the notification arrives
-if the stack isn't visible but contain notifiations, make the new one the current \
one


 M  +10 -0     applet.cpp  


--- trunk/KDE/kdebase/workspace/plasma/generic/applets/systemtray/ui/applet.cpp \
#1083238:1083239 @@ -683,6 +683,10 @@
     //At this point we are sure the pointer is valid
     m_notificationScroller->addNotification(notification);
 
+    if (isPopupShowing()) {
+        return;
+    }
+
     if (!m_notificationStack) {
         m_notificationStack = new NotificationStack(this);
         if (containment() && containment()->corona()) {
@@ -698,11 +702,17 @@
         }
     }
 
+
     m_notificationStack->addNotification(notification);
     m_notificationStackDialog->syncToGraphicsWidget();
 
     if (containment() && containment()->corona()) {
         m_notificationStackDialog->move(containment()->corona()->popupPosition(this, \
m_notificationStackDialog->size())); +
+        if (!m_notificationStackDialog->isVisible()) {
+            m_notificationStack->setCurrentNotification(notification);
+        }
+
         m_notificationStackDialog->show();
         Plasma::WindowEffects::slideWindow(m_notificationStackDialog, location());
     }


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