Fix #67072 and all its dupes.

svn path=/trunk/kdebase/kwin/; revision=264456
This commit is contained in:
Luboš Luňák 2003-11-04 10:53:04 +00:00
parent 29d74cee50
commit d2c1750fa9

View file

@ -336,9 +336,6 @@ bool Client::manage( Window w, bool isMapped )
if ( workspace()->isNotManaged( caption() ) ) if ( workspace()->isNotManaged( caption() ) )
doNotShow = TRUE; doNotShow = TRUE;
if( isTopMenu())
doNotShow = true;
// other settings from the previous session // other settings from the previous session
if ( session ) if ( session )
{ {
@ -430,6 +427,9 @@ bool Client::manage( Window w, bool isMapped )
user_time = readUserTimeMapTimestamp( asn_valid ? &asn_data : NULL, session ); user_time = readUserTimeMapTimestamp( asn_valid ? &asn_data : NULL, session );
if( isTopMenu()) // they're shown in Workspace::addClient() if their mainwindow
hideClient( true ); // is the active one
if ( isShown( true ) && !doNotShow ) if ( isShown( true ) && !doNotShow )
{ {
if( isDialog()) if( isDialog())
@ -484,14 +484,11 @@ bool Client::manage( Window w, bool isMapped )
} }
else // doNotShow else // doNotShow
{ // SELI HACK !!! { // SELI HACK !!!
rawHide(); hideClient( true );
setMappingState( IconicState ); setMappingState( IconicState );
} }
assert( mappingState() != WithdrawnState ); assert( mappingState() != WithdrawnState );
if( isTopMenu())
hideClient( true );
if( user_time == CurrentTime || user_time == -1U ) // no known user time, set something old if( user_time == CurrentTime || user_time == -1U ) // no known user time, set something old
{ {
user_time = qt_x_time - 1000000; user_time = qt_x_time - 1000000;