From 1448e53da513e3315a7949d16342819541d19327 Mon Sep 17 00:00:00 2001
From: Waldo Bastian <bastian@kde.org>
Date: Thu, 23 May 2002 23:57:47 +0000
Subject: [PATCH] Don't show the desktop menubar when a full-screen app is
 shown.

svn path=/trunk/kdebase/kwin/; revision=157263
---
 workspace.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/workspace.cpp b/workspace.cpp
index a4150531a2..3791712eed 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -1379,14 +1379,19 @@ void Workspace::setActiveClient( Client* c )
 
     // show the new menu bar first...
     Client* menubar = 0;
+    bool has_full_screen = false;
     for ( ClientList::ConstIterator it = clients.begin(); it != clients.end(); ++it) {
         if ( (*it)->isMenu() && (*it)->mainClient() == main ) {
             menubar = *it;
-            break;
+        }
+        if ( (*it)->isVisible() && (*it)->isFullScreen() &&
+            !(*it)->isDesktop() && (*it)->staysOnTop() ) {
+            has_full_screen = true;
         }
     }
-    if ( !menubar )
+    if ( !menubar && !has_full_screen)
     {
+        // Find the menubar of the desktop
         if ( desktops.isEmpty() ) {
             for ( ClientList::ConstIterator it = clients.begin(); it != clients.end(); ++it) {
                 if ( (*it)->isMenu() && (*it)->mainClient() == (*it) ) {