~compiz-team/compiz/0.9.10

Viewing changes to plugins/grid/src/grid.cpp

Committer: Tarmac
Author(s): Chris Townsend
Date: 2013-12-11 18:12:11 UTC
mfrom: (3798.1.1 compiz-0.9.10)
Revision ID: tarmac-20131211181211-xi9pt71kxwmz1cpr

When saving window geometry when going into maximized/semi-maximized, also save for grabbed windows as well. This fixes a desktop hang condition. This is a backport from lp:compiz revno. 3803. Fixes: https://bugs.launchpad.net/bugs/1244754.

Approved by Brandon Schaefer, PS Jenkins bot.

files modified:
plugins/grid/src/grid.cpp

Show diffs side-by-side

added added

removed removed

plugins/grid/src/grid.cpp

1011

{

1012

lastTarget = GridUnknown;

1013

1014

if (!window->grabbed ())

1015

{

1016

if (isGridHorzMaximized)

1017

{

1018

window->saveMask () |= CWY | CWHeight;

1019

window->saveWc ().y = originalSize.y ();

1020

window->saveWc ().height = originalSize.height ();

1021

}

1022

else if (isGridVertMaximized)

1023

{

1024

window->saveMask () |= CWX | CWWidth;

1025

window->saveWc ().x = originalSize.x ();

1026

window->saveWc ().width = originalSize.width ();

1027

}