alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix errorneously opening a broken context menu when middle clicking Plasma popup

Browse Source 
BUG: 342702
This commit is contained in:
Kai Uwe Broulik 2015-01-11 17:50:52 +01:00
parent 48e9c2f29e
commit 7476decf29
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/scriptengines/qml/plasmoid/appletinterface.cpp
View File

@ -602,6 +602,8 @@ void AppletInterface::executeAction(const QString &name)
bool AppletInterface::eventFilter(QObject *watched, QEvent *event) bool AppletInterface::eventFilter(QObject *watched, QEvent *event)
{ {
if (event->type() == QEvent::MouseButtonPress) { if (event->type() == QEvent::MouseButtonPress) {
QMouseEvent *e = static_cast<QMouseEvent *>(event);
//pass it up to the applet //pass it up to the applet
//well, actually we have to pass it to the *containment* //well, actually we have to pass it to the *containment*
//because all the code for showing an applet's contextmenu is actually in Containment. //because all the code for showing an applet's contextmenu is actually in Containment.
@ -612,13 +614,24 @@ bool AppletInterface::eventFilter(QObject *watched, QEvent *event)
if (!plugin) { if (!plugin) {
return false; return false;
} }
//the plugin can be a single action or a context menu
//Don't have an action list? execute as single action
//and set the event position as action data
if (plugin->contextualActions().length() == 1) {
QAction *action = plugin->contextualActions().first();
action->setData(e->globalPos());
action->trigger();
return true;
}
ContainmentInterface *ci = c->property("_plasma_graphicObject").value<ContainmentInterface *>(); ContainmentInterface *ci = c->property("_plasma_graphicObject").value<ContainmentInterface *>();
QMenu desktopMenu; QMenu desktopMenu;
ci->addAppletActions(desktopMenu, applet(), event); ci->addAppletActions(desktopMenu, applet(), event);
if (!desktopMenu.isEmpty()) { if (!desktopMenu.isEmpty()) {
desktopMenu.exec(static_cast<QMouseEvent*>(event)->globalPos()); desktopMenu.exec(e->globalPos());
return true; return true;
} }