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

List:       kde-commits
Subject:    branches/KDE/4.6/kdebase/workspace/plasma/desktop/applets/kickoff/simpleapplet
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2011-01-28 21:56:42
Message-ID: 20110128215642.1FE34AC8BB () svn ! kde ! org
[Download RAW message or body]

SVN commit 1217822 by aseigo:

set status when menu hides
CCBUG:264679


 M  +7 -1      simpleapplet.cpp  
 M  +2 -0      simpleapplet.h  


--- branches/KDE/4.6/kdebase/workspace/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.cpp \
#1217821:1217822 @@ -596,7 +596,7 @@
         menuview->setFormatType( (Kickoff::MenuView::FormatType) d->formattype );
         menuview->setContextMenuPolicy(Qt::CustomContextMenu);
         connect(menuview, SIGNAL(triggered(QAction*)), this, \
                SLOT(actionTriggered(QAction*)));
-        connect(menuview, SIGNAL(aboutToHide()), d->icon, SLOT(setUnpressed()));
+        connect(menuview, SIGNAL(aboutToHide()), this, SLOT(menuHiding()));
         connect(menuview, SIGNAL(customContextMenuRequested(QMenu*, const QPoint&)),
                 this, SLOT(customContextMenuRequested(QMenu*, const QPoint&)));
         //connect(menuview, SIGNAL(afterBeingHidden()), menuview, \
SLOT(deleteLater())); @@ -758,6 +758,12 @@
     d->menuview.data()->popup(popupPosition(d->menuview.data()->sizeHint()));
 }
 
+void MenuLauncherApplet::menuHiding()
+{
+    d->icon->setUnpressed();
+    setStatus(Plasma::PassiveStatus);
+}
+
 void MenuLauncherApplet::actionTriggered(QAction *action)
 {
     const KUrl url = action->data().value<KUrl>();
--- branches/KDE/4.6/kdebase/workspace/plasma/desktop/applets/kickoff/simpleapplet/simpleapplet.h \
#1217821:1217822 @@ -151,6 +151,8 @@
     void actionTriggered(QAction *action);
     /// Icon size setting changed
     void iconSizeChanged(int group);
+    /// Menu is hidden, reset the UI
+    void menuHiding();
 
 private:
     class Private;


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