More work on webview (wip) - some fixes around widgets

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5991 17fca916-40b9-46aa-a4ea-0a15b648b75c

1 files changed, 26 insertions, 6 deletions

diff --git a/src/modules/objects/KvsObject_popupMenu.cpp b/src/modules/objects/KvsObject_popupMenu.cpp
index 668caad35..dd03eb010 100644
--- a/src/modules/objects/KvsObject_popupMenu.cpp
+++ b/src/modules/objects/KvsObject_popupMenu.cpp
@@ -365,13 +365,23 @@ KVSO_CLASS_FUNCTION(popupMenu,insertSeparator)
 void KvsObject_popupMenu::slothovered(QAction *a)
 {
 	QHashIterator<int, QAction *> i(actionsDict);
+	bool bFound=false;
 	while (i.hasNext())
 	{
 		i.next();
-		if (i.value()== a) break;
+		if (i.value()== a)
+		{
+			bFound=true;
+			break;
+		}
+	}
+
+	// check if the action was created inside this class
+	if(bFound)
+	{
+		KviKvsVariantList params(new KviKvsVariant((kvs_int_t)i.key()));
+		callFunction(this,"highlightedEvent",&params);
 	}
-	KviKvsVariantList params(new KviKvsVariant((kvs_int_t)i.key()));
-	callFunction(this,"highlightedEvent",&params);
 }
 void KvsObject_popupMenu::aboutToDie(QObject *pObject)
 {
@@ -387,13 +397,23 @@ KVSO_CLASS_FUNCTION(popupMenu,highlightedEvent)
 void KvsObject_popupMenu::slottriggered(QAction *a)
 {
 	QHashIterator<int, QAction *> i(actionsDict);
+	bool bFound=false;
 	while (i.hasNext())
 	{
 		i.next();
-		if (i.value()== a) break;
+		if (i.value()== a)
+		{
+			bFound=true;
+			break;
+		}
+	}
+
+	// check if the action was created inside this class
+	if(bFound)
+	{
+		KviKvsVariantList params(new KviKvsVariant((kvs_int_t)i.key()));
+		callFunction(this,"activatedEvent",&params);
 	}
-	KviKvsVariantList params(new KviKvsVariant((kvs_int_t)i.key()));
-	callFunction(this,"activatedEvent",&params);
 }
 
 KVSO_CLASS_FUNCTION(popupMenu,activatedEvent)