From 73400589873039676d774a149e32cce441c072eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Mon, 8 Aug 2005 14:44:53 +0000 Subject: [PATCH] Got the order backwards, maximizing needs to come before placing on mainwindow. svn path=/trunk/KDE/kdebase/kwin/; revision=444056 --- placement.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/placement.cpp b/placement.cpp index 17404ba653..e88b6c420d 100644 --- a/placement.cpp +++ b/placement.cpp @@ -459,6 +459,8 @@ void Placement::placeOnMainWindow(Client* c, QRect& area, Policy nextPlacement ) { if( nextPlacement == Unknown ) nextPlacement = Centered; + if( nextPlacement == Maximizing ) // maximize if needed + placeMaximizing( c, area, NoPlacement ); area = checkArea( c, area ); ClientList mainwindows = c->mainClients(); Client* place_on = NULL; @@ -483,7 +485,7 @@ void Placement::placeOnMainWindow(Client* c, QRect& area, Policy nextPlacement ) // made as large as its maximum size and then placed centered. // So the nextPlacement argument allows chaining. In this case, nextPlacement // is Maximizing and it will call placeCentered(). - place( c, area, nextPlacement, Centered ); + place( c, area, Centered ); return; } } @@ -492,7 +494,7 @@ void Placement::placeOnMainWindow(Client* c, QRect& area, Policy nextPlacement ) { // 'mains_count' is used because it doesn't include ignored mainwindows if( mains_count != 1 ) { - place( c, area, nextPlacement, Centered ); + place( c, area, Centered ); return; } place_on = place_on2; // use the only window filtered together with 'mains_count' @@ -503,8 +505,6 @@ void Placement::placeOnMainWindow(Client* c, QRect& area, Policy nextPlacement ) // get area again, because the mainwindow may be on different xinerama screen area = checkArea( c, QRect()); c->keepInArea( area ); // make sure it's kept inside workarea - if( nextPlacement == Maximizing ) // maximize if needed - placeMaximizing( c, area, Unknown ); } void Placement::placeMaximizing(Client* c, QRect& area, Policy nextPlacement )