kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2024-12-26 23:21:37 +03:00
Code Issues Projects Releases Wiki Activity

improve context menus for wayland

Browse Source
This commit is contained in:
Michail Vourlakos 2018-03-02 20:21:29 +02:00
parent 410190e615
commit 6bb7f0ab51
3 changed files with 41 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
app/dock/dockmenumanager.cpp
View File

@ -83,7 +83,7 @@ bool DockMenuManager::mousePressEvent(QMouseEvent *event)
m_contextMenu = 0;
emit contextMenuChanged();
// PlasmaQuick::ContainmentView::mousePressEvent(event);
return true;
return false;
}
//qDebug() << "1 ...";
@ -175,6 +175,16 @@ bool DockMenuManager::mousePressEvent(QMouseEvent *event)
if (!provides.contains(QLatin1String("org.kde.plasma.multitasking"))) {
//qDebug() << "4...";
QMenu *desktopMenu = new QMenu;
//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);
//end workaround
if (desktopMenu->winId()) {
desktopMenu->windowHandle()->setTransientParent(m_dockView);
}
desktopMenu->setAttribute(Qt::WA_DeleteOnClose);
m_contextMenu = desktopMenu;
@ -337,13 +347,15 @@ void DockMenuManager::addAppletActions(QMenu *desktopMenu, Plasma::Applet *apple
}
}
QMenu *containmentMenu = new QMenu(i18nc("%1 is the name of the containment", "%1 Options", m_dockView->containment()->title()), desktopMenu);
addContainmentActions(containmentMenu, event);
QAction *containmentAction = desktopMenu->menuAction();
containmentAction->setText(i18nc("%1 is the name of the containment", "%1 Options", m_dockView->containment()->title()));
if (!containmentMenu->isEmpty()) {
addContainmentActions(containmentAction->menu(), event);
if (!containmentAction->menu()->isEmpty()) {
int enabled = 0;
//count number of real actions
QListIterator<QAction *> actionsIt(containmentMenu->actions());
QListIterator<QAction *> actionsIt(containmentAction->menu()->actions());
while (enabled < 3 && actionsIt.hasNext()) {
QAction *action = actionsIt.next();
@ -358,7 +370,7 @@ void DockMenuManager::addAppletActions(QMenu *desktopMenu, Plasma::Applet *apple
if (enabled) {
//if there is only one, don't create a submenu
// if (enabled < 2) {
foreach (QAction *action, containmentMenu->actions()) {
foreach (QAction *action, containmentAction->menu()->actions()) {
if (action->isVisible()) {
desktopMenu->addAction(action);
}
@ -418,6 +430,19 @@ void DockMenuManager::addContainmentActions(QMenu *desktopMenu, QEvent *event)
QList<QAction *> actions = plugin->contextualActions();
foreach (auto act, actions) {
if (act->menu()) {
//this is a workaround where Qt now creates the menu widget
//in .exec before oxygen can polish it and set the following attribute
act->menu()->setAttribute(Qt::WA_TranslucentBackground);
//end workaround
if (act->menu()->winId()) {
act->menu()->windowHandle()->setTransientParent(m_dockView);
}
}
}
desktopMenu->addActions(actions);
return;

6
containment/package/contents/ui/applet/AppletItem.qml
View File

@ -612,7 +612,8 @@ Item {
return;
}
if (root.isHalfShown || (root.latteApplet && root.latteApplet.noTasksInAnimation>0)) {
if (root.isHalfShown || (root.latteApplet
&& (root.latteApplet.noTasksInAnimation>0 || root.latteApplet.contextMenu))) {
return;
}
@ -648,7 +649,8 @@ Item {
return;
}
if (root.isHalfShown || (root.latteApplet && root.latteApplet.noTasksInAnimation>0)) {
if (root.isHalfShown || (root.latteApplet
&& (root.latteApplet.noTasksInAnimation>0 || root.latteApplet.contextMenu))) {
return;
}

8
plasmoid/package/contents/ui/task/TaskDelegate.qml
View File

@ -1057,8 +1057,12 @@ MouseArea{
if (isSeparator && !root.editMode)
return;
contextMenu = root.createContextMenu(mainItemContainer, modelIndex(), args);
contextMenu.show();
if (!root.contextMenu) {
contextMenu = root.createContextMenu(mainItemContainer, modelIndex(), args);
contextMenu.show();
} else {
root.contextMenu.close();
}
}
function modifierAccepted(mouse){