summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Spilsbury <sam.spilsbury@canonical.com>2011-09-29 11:54:18 +0800
committerSam Spilsbury <sam.spilsbury@canonical.com>2011-09-29 11:54:18 +0800
commitf5b0da5c10659fc147cb61f129d089c3fd196d45 (patch)
tree360e370fc9e95b11ae4cf0c210360a08bd1a2ec9
parentaf223e5c09fd6c57ac31b59996008bc88eaa901b (diff)
parentdac3434bd68ccc58907b3f8e8b4d6ea1a7b4ef34 (diff)
downloadcore-f5b0da5c10659fc147cb61f129d089c3fd196d45.tar.gz
core-f5b0da5c10659fc147cb61f129d089c3fd196d45.tar.bz2
Merge lp:~compiz-team/compiz-core/compiz-core.fix_861341
-rw-r--r--src/screen.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/screen.cpp b/src/screen.cpp
index 41995d1..f5568f5 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -3250,6 +3250,7 @@ void
CompScreen::updateWorkarea ()
{
CompRect workArea;
+ CompRegion allWorkArea = CompRegion ();
bool workAreaChanged = false;
for (unsigned int i = 0; i < priv->outputDevs.size (); i++)
@@ -3263,11 +3264,11 @@ CompScreen::updateWorkarea ()
workAreaChanged = true;
priv->outputDevs[i].setWorkArea (workArea);
}
+
+ allWorkArea += workArea;
}
- workArea = priv->computeWorkareaForBox (CompRect (0, 0,
- screen->width (),
- screen->height ()));
+ workArea = allWorkArea.boundingRect ();
if (priv->workArea != workArea)
{