Ensure that when a desktop item opens it's context menu it hides the main desktop's context menu (if visible).

4 files changed, 5 insertions, 0 deletions

diff --git a/lumina-desktop/LDesktop.cpp b/lumina-desktop/LDesktop.cpp
index 67ded6bd..4da38e78 100644
--- a/lumina-desktop/LDesktop.cpp
+++ b/lumina-desktop/LDesktop.cpp
@@ -232,6 +232,7 @@ void LDesktop::InitDesktop(){
       connect(bgDesktop, SIGNAL(PluginRemovedByUser(QString)), this, SLOT(RemoveDeskPlugin(QString)) );
       connect(bgDesktop, SIGNAL(IncreaseIcons()), this, SLOT(IncreaseDesktopPluginIcons()) );
       connect(bgDesktop, SIGNAL(DecreaseIcons()), this, SLOT(DecreaseDesktopPluginIcons()) );
+      connect(bgDesktop, SIGNAL(HideDesktopMenu()), deskMenu, SLOT(hide()));
   if(DEBUG){ qDebug() << " - Desktop Init Done:" << desktopnumber; }
   //Start the update processes
   QTimer::singleShot(10,this, SLOT(UpdateMenu()) );
diff --git a/lumina-desktop/LDesktopPluginSpace.cpp b/lumina-desktop/LDesktopPluginSpace.cpp
index 28ff94a6..00d3c34c 100644
--- a/lumina-desktop/LDesktopPluginSpace.cpp
+++ b/lumina-desktop/LDesktopPluginSpace.cpp
@@ -132,6 +132,7 @@ void LDesktopPluginSpace::addDesktopPlugin(QString plugID){
     connect(plug, SIGNAL(RemovePlugin(QString)), this, SLOT(RemoveItem(QString)) );
     connect(plug, SIGNAL(IncreaseIconSize()), this, SIGNAL(IncreaseIcons()) );
     connect(plug, SIGNAL(DecreaseIconSize()), this, SIGNAL(DecreaseIcons()) );
+    connect(plug, SIGNAL(CloseDesktopMenu()), this, SIGNAL(HideDesktopMenu()) );
   }
 }
 
diff --git a/lumina-desktop/LDesktopPluginSpace.h b/lumina-desktop/LDesktopPluginSpace.h
index b3c87ce4..51d594f8 100644
--- a/lumina-desktop/LDesktopPluginSpace.h
+++ b/lumina-desktop/LDesktopPluginSpace.h
@@ -28,6 +28,7 @@ signals:
 	void PluginRemovedByUser(QString ID);
 	void IncreaseIcons(); //increase default icon sizes
 	void DecreaseIcons(); //decrease default icon sizes
+	void HideDesktopMenu();
 	
 public:
 	LDesktopPluginSpace(QWidget *parent = 0);
diff --git a/lumina-desktop/desktop-plugins/LDPlugin.h b/lumina-desktop/desktop-plugins/LDPlugin.h
index 6a3c82a1..27fcaa24 100644
--- a/lumina-desktop/desktop-plugins/LDPlugin.h
+++ b/lumina-desktop/desktop-plugins/LDPlugin.h
@@ -98,11 +98,13 @@ public slots:
 	  setupMenu();
 	}
 	void showPluginMenu(){
+	  emit CloseDesktopMenu();
 	  menu->popup( QCursor::pos() );
 	}
 	
 signals:
 	void OpenDesktopMenu();
+	void CloseDesktopMenu();
 	void PluginResized();
 	
 	//Signals for communication with the desktop layout system (not generally used by hand)