fixed Thomas Zander's focusFollowsMouse showstopper
svn path=/trunk/kdebase/kwin/; revision=66481
This commit is contained in:
parent
c0459f2a91
commit
a3b30fce8c
1 changed files with 3 additions and 3 deletions
|
@ -623,8 +623,8 @@ bool Client::manage( bool isMapped, bool doNotShow, bool isInitial )
|
||||||
maximize( Client::MaximizeHorizontal );
|
maximize( Client::MaximizeHorizontal );
|
||||||
|
|
||||||
|
|
||||||
if ( isMaximizable() && !isMaximized() && width() >= area.width() && height() >= area.height()
|
if ( isMaximizable() && !isMaximized() && width() >= area.width() && height() >= area.height()
|
||||||
&& ( geom.topLeft() == area.topLeft() ||
|
&& ( geom.topLeft() == area.topLeft() ||
|
||||||
geom.topLeft() == workspace()->geometry().topLeft() ) ) {
|
geom.topLeft() == workspace()->geometry().topLeft() ) ) {
|
||||||
maximize( Client::MaximizeFull );
|
maximize( Client::MaximizeFull );
|
||||||
}
|
}
|
||||||
|
@ -1792,7 +1792,7 @@ void Client::gravitate( bool invert )
|
||||||
*/
|
*/
|
||||||
bool Client::x11Event( XEvent * e)
|
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 )
|
if ( options->focusPolicy == Options::ClickToFocus )
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue