removed debug out, small fix for mac menu
svn path=/trunk/kdebase/kwin/; revision=68088icc-effect-5.14.5
parent
8ba0c8171f
commit
0b4ba11c29
|
@ -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
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
Loading…
Reference in New Issue