kastet/latte-dock
1
0
Fork 0
mirror of https://github.com/KDE/latte-dock.git synced 2025-03-12 00:58:18 +03:00
Code Issues Projects Releases Wiki Activity

fix Canvas context menu issues

Browse Source 
--fix a crash when using left click in Canvas window
--fix blocking View when switching for editMode to
inConfigureApplets mode and vice versa
This commit is contained in:
Michail Vourlakos 2020-07-11 20:57:54 +03:00
parent a4445a3e9a
commit 6a4aeb16f0
3 changed files with 37 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
app/view/contextmenu.cpp
View File

@ -157,59 +157,55 @@ bool ContextMenu::mousePressEventForContainmentMenu(QQuickView *view, QMouseEven
event->setAccepted(false);
return false;
}
}
if (m_latteView->containment()) {
QMenu *desktopMenu = new QMenu;
desktopMenu->setAttribute(Qt::WA_TranslucentBackground);
if (m_latteView->containment()) {
QMenu *desktopMenu = new QMenu;
desktopMenu->setAttribute(Qt::WA_TranslucentBackground);
if (desktopMenu->winId()) {
desktopMenu->windowHandle()->setTransientParent(view);
}
desktopMenu->setAttribute(Qt::WA_DeleteOnClose);
m_contextMenu = desktopMenu;
emit menuChanged();
auto ungrabMouseHack = [this, view]() {
if (m_latteView->mouseGrabberItem()) {
m_latteView->mouseGrabberItem()->ungrabMouse();
if (desktopMenu->winId()) {
desktopMenu->windowHandle()->setTransientParent(m_latteView);
}
if (view->mouseGrabberItem()) {
view->mouseGrabberItem()->ungrabMouse();
desktopMenu->setAttribute(Qt::WA_DeleteOnClose);
m_contextMenu = desktopMenu;
emit menuChanged();
auto ungrabMouseHack = [this]() {
if (m_latteView->mouseGrabberItem()) {
m_latteView->mouseGrabberItem()->ungrabMouse();
}
};
if (QVersionNumber::fromString(qVersion()) > QVersionNumber(5, 8, 0)) {
QTimer::singleShot(0, this, ungrabMouseHack);
} else {
ungrabMouseHack();
}
};
if (QVersionNumber::fromString(qVersion()) > QVersionNumber(5, 8, 0)) {
QTimer::singleShot(0, this, ungrabMouseHack);
} else {
ungrabMouseHack();
}
emit m_latteView->containment()->contextualActionsAboutToShow();
addContainmentActions(desktopMenu, event);
emit m_latteView->containment()->contextualActionsAboutToShow();
addContainmentActions(desktopMenu, event);
desktopMenu->setAttribute(Qt::WA_TranslucentBackground);
desktopMenu->setAttribute(Qt::WA_TranslucentBackground);
QPoint globalPos = event->globalPos();
desktopMenu->adjustSize();
QPoint globalPos = event->globalPos();
desktopMenu->adjustSize();
QRect popUpRect(globalPos.x(), globalPos.y(), desktopMenu->width(), desktopMenu->height());
QRect popUpRect(globalPos.x(), globalPos.y(), desktopMenu->width(), desktopMenu->height());
globalPos = popUpRelevantToGlobalPoint(QRect(0,0,0,0), popUpRect);
globalPos = popUpRelevantToGlobalPoint(QRect(0,0,0,0), popUpRect);
if (desktopMenu->isEmpty()) {
delete desktopMenu;
event->accept();
return false;
}
if (desktopMenu->isEmpty()) {
delete desktopMenu;
event->accept();
connect(desktopMenu, SIGNAL(aboutToHide()), this, SLOT(menuAboutToHide()));
desktopMenu->popup(globalPos);
event->setAccepted(true);
return false;
}
connect(desktopMenu, SIGNAL(aboutToHide()), this, SLOT(menuAboutToHide()));
desktopMenu->popup(globalPos);
event->setAccepted(true);
return false;
}
return true;

2
app/view/contextmenu.h
View File

@ -74,7 +74,7 @@ private:
private:
QMenu *m_contextMenu{nullptr};
QPointer<QMenu> m_contextMenu;
QMetaMethod m_appletContainsMethod;
QQuickItem *m_appletContainsMethodItem{nullptr};

1
app/view/settings/canvasconfigview.cpp
View File

@ -125,6 +125,7 @@ void CanvasConfigView::mousePressEvent(QMouseEvent *event)
bool result = m_latteView->contextMenu()->mousePressEventForContainmentMenu(this, event);
QQuickView::mousePressEvent(event);
}
bool CanvasConfigView::event(QEvent *e)