diff options
| author | Jesse Smith <jsmith@resonatingmedia.com> | 2015-07-18 12:53:11 -0300 |
|---|---|---|
| committer | Jesse Smith <jsmith@resonatingmedia.com> | 2015-07-18 12:53:11 -0300 |
| commit | 676baf4bb756e98b5df08b8e7c38d5050eae150a (patch) | |
| tree | abacf948fb92f6fdea22125179ef45a4bc3183c5 /lumina-desktop/LDesktop.cpp | |
| parent | Updated dependency and build instructors for Fedora. (diff) | |
| parent | Fix up a calculation of the new window geometry - add in checks for those str... (diff) | |
| download | lumina-676baf4bb756e98b5df08b8e7c38d5050eae150a.tar.gz lumina-676baf4bb756e98b5df08b8e7c38d5050eae150a.tar.bz2 lumina-676baf4bb756e98b5df08b8e7c38d5050eae150a.zip | |
Merge branch 'master' of https://github.com/pcbsd/lumina
Diffstat (limited to 'lumina-desktop/LDesktop.cpp')
| -rw-r--r-- | lumina-desktop/LDesktop.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lumina-desktop/LDesktop.cpp b/lumina-desktop/LDesktop.cpp index ec56b7b0..7b21b862 100644 --- a/lumina-desktop/LDesktop.cpp +++ b/lumina-desktop/LDesktop.cpp @@ -292,8 +292,8 @@ void LDesktop::InitDesktop(){ bgWindow = new QWidget(); bgWindow->setObjectName("bgWindow"); bgWindow->setContextMenuPolicy(Qt::CustomContextMenu); - bgWindow->setWindowFlags(Qt::FramelessWindowHint); - LX11::SetAsDesktop(bgWindow->winId()); + bgWindow->setWindowFlags(Qt::WindowStaysOnBottomHint | Qt::CustomizeWindowHint | Qt::FramelessWindowHint); + LSession::handle()->XCB->SetAsDesktop(bgWindow->winId()); bgWindow->setGeometry(desktop->screenGeometry(desktopnumber)); connect(bgWindow, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(ShowMenu()) ); if(DEBUG){ qDebug() << "Create bgDesktop"; } @@ -361,8 +361,6 @@ void LDesktop::UpdateMenu(bool fast){ if(!desktoplocked){ deskMenu->addAction(LXDG::findIcon("document-encrypt",""),tr("Lock Desktop"), this, SLOT(ToggleDesktopLock()) ); deskMenu->addAction(LXDG::findIcon("snap-orthogonal",""),tr("Snap Plugins to Grid"), this, SLOT(AlignDesktopPlugins()) ); - deskMenu->addAction(LXDG::findIcon("shapes",""), tr("Tile Plugins"), bgDesktop, SLOT(tileSubWindows()) ); - deskMenu->addAction(LXDG::findIcon("window-duplicate",""), tr("Cascade Plugins"), bgDesktop, SLOT(cascadeSubWindows()) ); }else{ deskMenu->addAction(LXDG::findIcon("document-decrypt",""),tr("Unlock Desktop"), this, SLOT(ToggleDesktopLock()) ); } deskMenu->addSeparator(); deskMenu->addAction(LXDG::findIcon("system-log-out",""), tr("Log Out"), this, SLOT(SystemLogout()) ); @@ -649,6 +647,8 @@ void LDesktop::UpdateDesktopPluginArea(){ for(int i=0; i<PANELS.length(); i++){ PANELS[i]->update(); } //Also need to re-arrange any desktop plugins to ensure that nothing is out of the screen area AlignDesktopPlugins(); + //Make sure to re-disable any WM control flags + LSession::handle()->XCB->SetDisableWMActions(bgWindow->winId()); } void LDesktop::UpdateBackground(){ |