From 0b4ba11c29e5fb271d02bd56e03ee5f7c04b688c Mon Sep 17 00:00:00 2001
From: Matthias Ettrich <ettrich@troll.no>
Date: Tue, 17 Oct 2000 13:09:59 +0000
Subject: [PATCH] removed debug out, small fix for mac menu

svn path=/trunk/kdebase/kwin/; revision=68088
---
 client.cpp    | 7 +++----
 workspace.cpp | 6 ++++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/client.cpp b/client.cpp
index 4f4b48d937..7e2eee9ecb 100644
--- a/client.cpp
+++ b/client.cpp
@@ -875,7 +875,6 @@ bool Client::unmapNotify( XUnmapEvent& e )
     case NormalState:
   	if ( !windowWrapper()->isVisibleTo( 0 ) && !e.send_event )
   	    return TRUE; // this event was produced by us as well
-	qDebug("UnmapNotify for %s.", caption().latin1() );
 
 	// maybe we will be destroyed soon. Check this first.
 	XEvent ev;
@@ -971,13 +970,13 @@ bool Client::configureRequest( XConfigureRequestEvent& e )
 	// the location to the current location but miscalculate the
 	// frame size due to kwin being a double-reparenting window
 	// manager
-	if ( ox == 0 && oy == 0 && 
-	     nx == x() + windowWrapper()->x() && 
+	if ( ox == 0 && oy == 0 &&
+	     nx == x() + windowWrapper()->x() &&
 	     ny == y() + windowWrapper()->y() ) {
 	    nx = x();
 	    ny = y();
 	}
-	    
+	
 	
 	QPoint np( nx-ox, ny-oy);
 #if 0	
diff --git a/workspace.cpp b/workspace.cpp
index ed1abd2721..83197cb791 100644
--- a/workspace.cpp
+++ b/workspace.cpp
@@ -997,10 +997,12 @@ void Workspace::activateClient( Client* c, bool force )
 void Workspace::iconifyOrDeiconifyTransientsOf( Client* c )
 {
     if ( c->isIconified() || c->isShade() ) {
+	bool exclude_menu = !c->isIconified();
 	for ( ClientList::ConstIterator it = clients.begin(); it != clients.end(); ++it) {
 	    if ( (*it)->transientFor() == c->window()
 		 && !(*it)->isIconified()
-		 && !(*it)->isShade() ) {
+		 && !(*it)->isShade() 
+		 && ( !exclude_menu || !(*it)->isMenu() ) ) {
 		(*it)->setMappingState( XIconicState );
 		(*it)->hide();
 		iconifyOrDeiconifyTransientsOf( (*it) );
@@ -1799,7 +1801,7 @@ void Workspace::setCurrentDesktop( int new_desktop ){
     Client* old_active_client = active_client;
     active_client = 0;
     block_focus = TRUE;
-    
+
     ClientList mapList;
     ClientList unmapList;