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

Replace QMenu::exec with QMenu::popup

Browse Source 
REVIEW: 127355
This commit is contained in:
David Rosca 2016-03-12 13:04:39 +01:00
parent 974a2b5071
commit 8f6d1f17e4
3 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -796,14 +796,16 @@ bool AppletInterface::eventFilter(QObject *watched, QEvent *event)
return true;
}
QMenu desktopMenu;
QMenu *desktopMenu = new QMenu;
ci->addAppletActions(desktopMenu, applet(), event);
if (!desktopMenu.isEmpty()) {
desktopMenu.exec(e->globalPos());
if (!desktopMenu->isEmpty()) {
desktopMenu->setAttribute(Qt::WA_DeleteOnClose);
desktopMenu->popup(e->globalPos());
return true;
}
delete desktopMenu;
return false;
}
}

45
src/scriptengines/qml/plasmoid/containmentinterface.cpp
View File

@ -932,9 +932,10 @@ void ContainmentInterface::mousePressEvent(QMouseEvent *event)
}
//qDebug() << "Invoking menu for applet" << applet;
QMenu desktopMenu;
QMenu *desktopMenu = new QMenu;
desktopMenu->setAttribute(Qt::WA_DeleteOnClose);
m_contextMenu = &desktopMenu;
m_contextMenu = desktopMenu;
if (applet) {
emit applet->contextualActionsAboutToShow();
@ -946,7 +947,7 @@ void ContainmentInterface::mousePressEvent(QMouseEvent *event)
//this is a workaround where Qt now creates the menu widget
//in .exec before oxygen can polish it and set the following attribute
desktopMenu.setAttribute(Qt::WA_TranslucentBackground);
desktopMenu->setAttribute(Qt::WA_TranslucentBackground);
//end workaround
if (window() && window()->mouseGrabberItem()) {
@ -955,17 +956,17 @@ void ContainmentInterface::mousePressEvent(QMouseEvent *event)
QPoint pos = event->globalPos();
if (window() && applet && m_containment->containmentType() == Plasma::Types::PanelContainment) {
desktopMenu.adjustSize();
desktopMenu->adjustSize();
if (QScreen *screen = window()->screen()) {
const QRect geo = screen->availableGeometry();
pos = QPoint(qBound(geo.left(), pos.x(), geo.right() + 1 - desktopMenu.width()),
qBound(geo.top(), pos.y(), geo.bottom() + 1 - desktopMenu.height()));
pos = QPoint(qBound(geo.left(), pos.x(), geo.right() + 1 - desktopMenu->width()),
qBound(geo.top(), pos.y(), geo.bottom() + 1 - desktopMenu->height()));
}
}
desktopMenu.exec(pos);
desktopMenu->popup(pos);
event->setAccepted(true);
}
@ -993,32 +994,32 @@ void ContainmentInterface::wheelEvent(QWheelEvent *event)
}
}
void ContainmentInterface::addAppletActions(QMenu &desktopMenu, Plasma::Applet *applet, QEvent *event)
void ContainmentInterface::addAppletActions(QMenu *desktopMenu, Plasma::Applet *applet, QEvent *event)
{
foreach (QAction *action, applet->contextualActions()) {
if (action) {
desktopMenu.addAction(action);
desktopMenu->addAction(action);
}
}
if (!applet->failedToLaunch()) {
QAction *runAssociatedApplication = applet->actions()->action(QStringLiteral("run associated application"));
if (runAssociatedApplication && runAssociatedApplication->isEnabled()) {
desktopMenu.addAction(runAssociatedApplication);
desktopMenu->addAction(runAssociatedApplication);
}
QAction *configureApplet = applet->actions()->action(QStringLiteral("configure"));
if (configureApplet && configureApplet->isEnabled()) {
desktopMenu.addAction(configureApplet);
desktopMenu->addAction(configureApplet);
}
QAction *appletAlternatives = applet->actions()->action(QStringLiteral("alternatives"));
if (appletAlternatives && appletAlternatives->isEnabled()) {
desktopMenu.addAction(appletAlternatives);
desktopMenu->addAction(appletAlternatives);
}
}
QMenu *containmentMenu = new QMenu(i18nc("%1 is the name of the containment", "%1 Options", m_containment->title()), &desktopMenu);
addContainmentActions(*containmentMenu, event);
QMenu *containmentMenu = new QMenu(i18nc("%1 is the name of the containment", "%1 Options", m_containment->title()), desktopMenu);
addContainmentActions(containmentMenu, event);
if (!containmentMenu->isEmpty()) {
int enabled = 0;
@ -1036,11 +1037,11 @@ void ContainmentInterface::addAppletActions(QMenu &desktopMenu, Plasma::Applet *
if (enabled < 2) {
foreach (QAction *action, containmentMenu->actions()) {
if (action->isVisible() && !action->isSeparator()) {
desktopMenu.addAction(action);
desktopMenu->addAction(action);
}
}
} else {
desktopMenu.addMenu(containmentMenu);
desktopMenu->addMenu(containmentMenu);
}
}
}
@ -1050,17 +1051,17 @@ void ContainmentInterface::addAppletActions(QMenu &desktopMenu, Plasma::Applet *
QAction *closeApplet = applet->actions()->action(QStringLiteral("remove"));
//qDebug() << "checking for removal" << closeApplet;
if (closeApplet) {
if (!desktopMenu.isEmpty()) {
desktopMenu.addSeparator();
if (!desktopMenu->isEmpty()) {
desktopMenu->addSeparator();
}
//qDebug() << "adding close action" << closeApplet->isEnabled() << closeApplet->isVisible();
desktopMenu.addAction(closeApplet);
desktopMenu->addAction(closeApplet);
}
}
}
void ContainmentInterface::addContainmentActions(QMenu &desktopMenu, QEvent *event)
void ContainmentInterface::addContainmentActions(QMenu *desktopMenu, QEvent *event)
{
if (m_containment->corona()->immutability() != Plasma::Types::Mutable &&
!KAuthorized::authorizeKAction(QStringLiteral("plasma/containment_actions"))) {
@ -1094,10 +1095,10 @@ void ContainmentInterface::addContainmentActions(QMenu &desktopMenu, QEvent *eve
if ((m_containment->containmentType() != Plasma::Types::PanelContainment &&
m_containment->containmentType() != Plasma::Types::CustomPanelContainment) &&
m_containment->actions()->action(QStringLiteral("configure"))) {
desktopMenu.addAction(m_containment->actions()->action(QStringLiteral("configure")));
desktopMenu->addAction(m_containment->actions()->action(QStringLiteral("configure")));
}
} else {
desktopMenu.addActions(actions);
desktopMenu->addActions(actions);
}
return;

4
src/scriptengines/qml/plasmoid/containmentinterface.h
View File

@ -167,8 +167,8 @@ protected:
void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
void wheelEvent(QWheelEvent *event) Q_DECL_OVERRIDE;
void addAppletActions(QMenu &desktopMenu, Plasma::Applet *applet, QEvent *event);
void addContainmentActions(QMenu &desktopMenu, QEvent *event);
void addAppletActions(QMenu *desktopMenu, Plasma::Applet *applet, QEvent *event);
void addContainmentActions(QMenu *desktopMenu, QEvent *event);
Q_SIGNALS:
/**