From 17c4c1f75c6e56acbe65935da96871b54a64158e Mon Sep 17 00:00:00 2001 From: Klas Kalass Date: Sat, 14 Dec 2002 15:20:45 +0000 Subject: [PATCH] do not force desktop menu on top of windows that want to be on top, fixes fullscreen behaviour for non-kde apps with multiple windows (i.e. mplayer) svn path=/trunk/kdebase/kwin/; revision=193897 --- workspace.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/workspace.cpp b/workspace.cpp index 80153db9be..49c3b76467 100644 --- a/workspace.cpp +++ b/workspace.cpp @@ -1484,7 +1484,11 @@ void Workspace::setActiveClient( Client* c ) if ( menubar ) { menubar->show(); - menubar->raise(); // better for FocusFollowsMouse than raiseClient(menubar) + // do not cover a client that wants to stay on top with the desktop menu + if ( menubar->mainClient() == active_client->mainClient() + || !active_client->staysOnTop()) + menubar->raise(); // better for FocusFollowsMouse than raiseClient(menubar) + raiseElectricBorders(); }