diff options
| author | Ken Moore <moorekou@gmail.com> | 2015-07-17 13:08:16 -0400 |
|---|---|---|
| committer | Ken Moore <moorekou@gmail.com> | 2015-07-17 13:08:16 -0400 |
| commit | 96bcdec1f14e8f880b0ef053c5436af3662b19b8 (patch) | |
| tree | ef33e6d0220a92ca308f58dd2ad3e5ba48a6fc48 /lumina-desktop/LDesktop.cpp | |
| parent | Merge branch 'master' of github.com:pcbsd/lumina (diff) | |
| download | lumina-96bcdec1f14e8f880b0ef053c5436af3662b19b8.tar.gz lumina-96bcdec1f14e8f880b0ef053c5436af3662b19b8.tar.bz2 lumina-96bcdec1f14e8f880b0ef053c5436af3662b19b8.zip | |
Commit some quick fixes:
1) Switch some X11->XCB functions around (SetAsDesktop(), SetDisableWMActions()).
2) Fix up some QtQuick plugin detection routines (now it will properly see the user's quickplugins if any).
3) Connect the status change signal/slots for QtQuick plugins to try and detect script failures and remove the script (still not working reliably).
Diffstat (limited to 'lumina-desktop/LDesktop.cpp')
| -rw-r--r-- | lumina-desktop/LDesktop.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lumina-desktop/LDesktop.cpp b/lumina-desktop/LDesktop.cpp index 7f7105f3..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"; } @@ -647,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(){ |