yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/KDE/4.8'

Browse source 
I did something wrong. The recent four fixes for klipper bugs were
cherry-picked from master into KDE/4.8. So they appear twice in the
merged history.

Conflicts:
	klipper/urlgrabber.cpp
This commit is contained in:
Jekyll Wu 2011-12-25 19:37:15 +08:00
commit ab936e40ab
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
manage.cpp
View file

@ -324,10 +324,11 @@ bool Client::manage(Window w, bool isMapped)
bool dontKeepInArea = false; bool dontKeepInArea = false;
if (!noBorder()) { if (!noBorder()) {
setClientGroup(NULL); setClientGroup(NULL);
bool autogrouping = rules()->checkAutogrouping(options->autogroupSimilarWindows);
// Automatically add to previous groups on session restore // Automatically add to previous groups on session restore
if (session && session->clientGroupClient && session->clientGroupClient != this && session->clientGroupClient->clientGroup()) if (session && session->clientGroupClient && session->clientGroupClient != this && session->clientGroupClient->clientGroup())
session->clientGroupClient->clientGroup()->add(this, -1, true); session->clientGroupClient->clientGroup()->add(this, -1, true);
else if (isMapped) else if (isMapped && autogrouping)
// If the window is already mapped (Restarted KWin) add any windows that already have the // If the window is already mapped (Restarted KWin) add any windows that already have the
// same geometry to the same client group. (May incorrectly handle maximized windows) // same geometry to the same client group. (May incorrectly handle maximized windows)
foreach (ClientGroup * group, workspace()->clientGroups) foreach (ClientGroup * group, workspace()->clientGroups)