diff options
-rw-r--r-- | lumina-desktop/LDesktop.cpp | 3 | ||||
-rw-r--r-- | lumina-desktop/LDesktop.h | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/lumina-desktop/LDesktop.cpp b/lumina-desktop/LDesktop.cpp index d3cde4c1..67ded6bd 100644 --- a/lumina-desktop/LDesktop.cpp +++ b/lumina-desktop/LDesktop.cpp @@ -218,10 +218,11 @@ void LDesktop::InitDesktop(){ bgWindow = new QWidget(); bgWindow->setObjectName("bgWindow"); bgWindow->setContextMenuPolicy(Qt::CustomContextMenu); + bgWindow->setFocusPolicy(Qt::StrongFocus); bgWindow->setWindowFlags(Qt::WindowStaysOnBottomHint | Qt::CustomizeWindowHint | Qt::FramelessWindowHint); LSession::handle()->XCB->SetAsDesktop(bgWindow->winId()); bgWindow->setGeometry(LSession::handle()->screenGeom(desktopnumber)); - connect(bgWindow, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(ShowMenu(const QPoint&)) ); + connect(bgWindow, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(ShowMenu()) ); if(DEBUG){ qDebug() << "Create bgDesktop"; } bgDesktop = new LDesktopPluginSpace(bgWindow); //new QMdiArea(bgWindow); int grid = settings->value(DPREFIX+"GridSize",-1).toInt(); diff --git a/lumina-desktop/LDesktop.h b/lumina-desktop/LDesktop.h index 55f31cd7..14b6efc3 100644 --- a/lumina-desktop/LDesktop.h +++ b/lumina-desktop/LDesktop.h @@ -83,11 +83,9 @@ private slots: //Menu functions void UpdateMenu(bool fast = false); - void ShowMenu(const QPoint &pt = QPoint()){ + void ShowMenu(){ UpdateMenu(true); //run the fast version - //qDebug() << "Show Context Menu:" << QCursor::pos() << pt; - if(pt.isNull()){ deskMenu->popup(QCursor::pos()); } - else{ deskMenu->popup( bgWindow->mapToGlobal(pt)); } + deskMenu->popup(QCursor::pos()); //} } void UpdateWinMenu(); void winClicked(QAction*); |