From 1a852fe8dc657feccb4fd84864b6c9eb7114397c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Wed, 3 Dec 2003 12:24:56 +0000 Subject: [PATCH] When unmapping, unmap from outside(frame->wrapper->window), this prevents frame from getting EnterNotify after unmapping the window. svn path=/trunk/kdebase/kwin/; revision=270953 --- client.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client.cpp b/client.cpp index ab49bc0737..54146a8702 100644 --- a/client.cpp +++ b/client.cpp @@ -703,8 +703,8 @@ void Client::setShade( ShadeMode mode ) shade_geometry_change = true; QSize s( sizeForClientSize( QSize( clientSize().width(), 0), SizemodeShaded ) ); XSelectInput( qt_xdisplay(), wrapper, ClientWinMask ); // avoid getting UnmapNotify - XUnmapWindow( qt_xdisplay(), client ); XUnmapWindow( qt_xdisplay(), wrapper ); + XUnmapWindow( qt_xdisplay(), client ); XSelectInput( qt_xdisplay(), wrapper, ClientWinMask | SubstructureNotifyMask ); // FRAME repaint( FALSE ); // bool wasStaticContents = testWFlags( WStaticContents ); @@ -857,9 +857,9 @@ void Client::rawHide() // will be missed is also very minimal, so I don't think it's needed to grab the server // here. XSelectInput( qt_xdisplay(), wrapper, ClientWinMask ); // avoid getting UnmapNotify - XUnmapWindow( qt_xdisplay(), client ); - XUnmapWindow( qt_xdisplay(), wrapper ); XUnmapWindow( qt_xdisplay(), frame ); + XUnmapWindow( qt_xdisplay(), wrapper ); + XUnmapWindow( qt_xdisplay(), client ); XSelectInput( qt_xdisplay(), wrapper, ClientWinMask | SubstructureNotifyMask ); if( decoration != NULL ) decoration->widget()->hide(); // not really necessary, but let it know the state