aboutsummaryrefslogtreecommitdiff
path: root/src-qt5
diff options
context:
space:
mode:
authorKen Moore <ken@ixsystems.com>2018-01-29 18:22:06 -0500
committerKen Moore <ken@ixsystems.com>2018-01-29 18:22:06 -0500
commit7631c2f6f6a76324b89517ce32a3f41c37bd4e61 (patch)
tree6e51b7abc3e5e43224728dcb7fc0223346ee105c /src-qt5
parentMerge branch 'master' of github.com:trueos/lumina (diff)
downloadlumina-7631c2f6f6a76324b89517ce32a3f41c37bd4e61.tar.gz
lumina-7631c2f6f6a76324b89517ce32a3f41c37bd4e61.tar.bz2
lumina-7631c2f6f6a76324b89517ce32a3f41c37bd4e61.zip
Make sure that the desktop canvas is always 2nd from the top of the stack of invisible windows.
Diffstat (limited to 'src-qt5')
-rw-r--r--src-qt5/core/lumina-desktop-unified/src-desktop/RootWindow.h2
-rw-r--r--src-qt5/core/lumina-desktop-unified/src-events/NativeWindowSystem.cpp2
2 files changed, 4 insertions, 0 deletions
diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/RootWindow.h b/src-qt5/core/lumina-desktop-unified/src-desktop/RootWindow.h
index 9cf42f3c..97b57a65 100644
--- a/src-qt5/core/lumina-desktop-unified/src-desktop/RootWindow.h
+++ b/src-qt5/core/lumina-desktop-unified/src-desktop/RootWindow.h
@@ -22,6 +22,8 @@ public:
void start();
+ WId viewID(){ return root_view->winId(); }
+
public slots:
void syncRootSize();
diff --git a/src-qt5/core/lumina-desktop-unified/src-events/NativeWindowSystem.cpp b/src-qt5/core/lumina-desktop-unified/src-events/NativeWindowSystem.cpp
index 28c223ab..e23050f3 100644
--- a/src-qt5/core/lumina-desktop-unified/src-events/NativeWindowSystem.cpp
+++ b/src-qt5/core/lumina-desktop-unified/src-events/NativeWindowSystem.cpp
@@ -965,6 +965,8 @@ void NativeWindowSystem::CheckDamageID(WId win){
void NativeWindowSystem::raiseWindow(NativeWindowObject *win){
qDebug() << "Raise Window:" << win->name();
+ //Note: Always ensure the desktop canvas is right under the main window that is raised
+ xcb_circulate_window(QX11Info::connection(), XCB_CIRCULATE_RAISE_LOWEST, Lumina::ROOTWIN->viewID());
xcb_circulate_window(QX11Info::connection(), XCB_CIRCULATE_RAISE_LOWEST ,win->id());
}
bgstack15