Merge lp:~3v1n0/compiz/scale-ignore-other-active-win into lp:compiz/0.9.9

[Marco Trevisan (Treviño)]

Scale: don't set the active window if it is not in the scale group

When we scale a window group, we should ignore an active window that is not currently scaled when setting the currently active/hovered windows or clients will get wrong infos.

This fixes the "gost glow" issue in unity.

[Brandon Schaefer (brandontschaefer)]

Looks good to me, works.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3587
http://jenkins.qa.ubuntu.com/job/compiz-clang-ci/38/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-clang-ci/./build=pbuilder,distribution=quantal,flavor=amd64/38/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/compiz-clang-ci/38//rebuild/?

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3587
http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/37/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/./build=pbuilder,distribution=quantal,flavor=amd64/37/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/compiz-gles-ci/37//rebuild/?

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3587
http://jenkins.qa.ubuntu.com/job/compiz-ci/387/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/387/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/compiz-ci/387//rebuild/?

review: Approve (continuous-integration)

=== modified file 'plugins/scale/src/scale.cpp'
--- plugins/scale/src/scale.cpp	2012-12-04 13:16:26 +0000
+++ plugins/scale/src/scale.cpp	2013-01-29 23:24:23 +0000
@@ -1214,9 +1214,24 @@
 	if (!lastActiveNum)
 	    lastActiveNum = screen->activeNum () - 1;
 
-	previousActiveWindow = screen->activeWindow ();
-	lastActiveWindow     = screen->activeWindow ();
-	selectedWindow       = screen->activeWindow ();
+	Window active_window = screen->activeWindow ();
+	bool found_active = false;
+
+	foreach (ScaleWindow *sw, windows)
+	{
+	    if (sw->window->id() == active_window)
+	    {
+		found_active = true;
+		break;
+	    }
+	}
+
+	if (!found_active)
+	    active_window = None;
+
+	previousActiveWindow = active_window;
+	lastActiveWindow     = active_window;
+	selectedWindow       = active_window;
 	hoveredWindow        = None;
 
 	this->state = ScaleScreen::Out;