From a3b30fce8c26a6434f4851f520c6d2cf97300610 Mon Sep 17 00:00:00 2001 From: Matthias Ettrich Date: Thu, 5 Oct 2000 18:38:02 +0000 Subject: [PATCH] fixed Thomas Zander's focusFollowsMouse showstopper svn path=/trunk/kdebase/kwin/; revision=66481 --- client.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/client.cpp b/client.cpp index 57f6bb5488..6fca64ed0c 100644 --- a/client.cpp +++ b/client.cpp @@ -623,8 +623,8 @@ bool Client::manage( bool isMapped, bool doNotShow, bool isInitial ) maximize( Client::MaximizeHorizontal ); - if ( isMaximizable() && !isMaximized() && width() >= area.width() && height() >= area.height() - && ( geom.topLeft() == area.topLeft() || + if ( isMaximizable() && !isMaximized() && width() >= area.width() && height() >= area.height() + && ( geom.topLeft() == area.topLeft() || geom.topLeft() == workspace()->geometry().topLeft() ) ) { maximize( Client::MaximizeFull ); } @@ -1792,7 +1792,7 @@ void Client::gravitate( bool invert ) */ bool Client::x11Event( XEvent * e) { - if ( e->type == EnterNotify && e->xcrossing.mode == NotifyNormal ) { + if ( e->type == EnterNotify && ( e->xcrossing.mode == NotifyNormal || e->xcrossing.mode == NotifyUngrab ) ) { if ( options->focusPolicy == Options::ClickToFocus ) return TRUE;