Merge lp:~3v1n0/unity/scale-window-glow into lp:unity

[Marco Trevisan (Treviño)]

UnityWindow: add glow drawing support and draw it around the scale selected window

Add glow border to the selected window in scale, as the spread design doc shows: http://is.gd/gTrlsu

To get that I've added the glow texture and painting facilities coming from the compiz group plugin.

Screenshot: http://i.imgur.com/ytg19.jpg

[Andrea Azzarone (azzar1)]

LGTM.

review: Approve

[John Lea (johnlea)]

review: Approve (design)

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1431/console reported an error when processing this lp:~3v1n0/unity/scale-window-glow branch.
Not merging it.

=== added file 'plugins/unityshell/src/glow_texture.h'
--- plugins/unityshell/src/glow_texture.h	1970-01-01 00:00:00 +0000
+++ plugins/unityshell/src/glow_texture.h	2012-09-28 09:43:23 +0000
@@ -0,0 +1,204 @@
+/**
+ *
+ *
+ * Copyright : (C) 2006-2010 by Patrick Niklaus, Roi Cohen,
+ * 				Danny Baumann, Sam Spilsbury
+ * Authors: Patrick Niklaus <[e-mail]>
+ *          Roi Cohen       <[e-mail]>
+ *          Danny Baumann   <[e-mail]>
+ * 	    Sam Spilsbury   <[e-mail]>
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ **/
+
+#ifndef UNITY_TEXTURE_GLOW_H
+#define UNITY_TEXTURE_GLOW_H
+
+namespace unity
+{
+namespace texture
+{
+
+/*
+ * glowTex
+ */
+
+const unsigned GLOW_SIZE = 32;
+const int GLOW_OFFSET = 21;
+const char GLOW[4097] = {
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\377\6\377"
+  "\377\377\6\377\377\377\6\377\377\377\6\377\377\377\6\377\377\377\6\377\377"
+  "\377\6\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\377\377\377\6\377\377\377\6\377\377\377\6\377\377"
+  "\377\6\377\377\377\6\377\377\377\6\377\377\377\6\377\377\377\6\377\377\377"
+  "\6\377\377\377\6\377\377\377\6\377\377\377\6\377\377\377\6\377\377\377\6"
+  "\377\377\377\14\377\377\377\14\377\377\377\14\377\377\377\14\377\377\377"
+  "\14\377\377\377\14\377\377\377\14\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\377\377\377\6\377\377\377\6\377\377\377\6\377\377\377\14"
+  "\377\377\377\14\377\377\377\22\377\377\377\22\377\377\377\22\377\377\377"
+  "\27\377\377\377\27\377\377\377\27\377\377\377\27\377\377\377\27\377\377\377"
+  "\27\377\377\377\27\377\377\377\27\377\377\377\27\377\377\377\27\377\377\377"
+  "\35\377\377\377\35\377\377\377\35\377\377\377\35\377\377\377\35\377\377\377"
+  "\35\377\377\377\35\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377"
+  "\377\6\377\377\377\6\377\377\377\14\377\377\377\22\377\377\377\27\377\377"
+  "\377\27\377\377\377\35\377\377\377#\377\377\377'\377\377\377'\377\377\377"
+  "+\377\377\377+\377\377\377+\377\377\377+\377\377\377+\377\377\377+\377\377"
+  "\377+\377\377\377+\377\377\377+\377\377\3771\377\377\3771\377\377\3771\377"
+  "\377\3771\377\377\3771\377\377\3771\377\377\3771\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\377\377\377\6\377\377\377\14\377\377\377\22\377\377\377"
+  "\27\377\377\377\35\377\377\377#\377\377\377+\377\377\3771\377\377\3776\377"
+  "\377\377<\377\377\377>\377\377\377C\377\377\377I\377\377\377I\377\377\377"
+  "I\377\377\377I\377\377\377I\377\377\377I\377\377\377I\377\377\377I\377\377"
+  "\377L\377\377\377L\377\377\377L\377\377\377L\377\377\377L\377\377\377L\377"
+  "\377\377L\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\377\6\377\377\377\14\377"
+  "\377\377\22\377\377\377\27\377\377\377#\377\377\377+\377\377\3776\377\377"
+  "\377C\377\377\377L\377\377\377U\377\377\377]\377\377\377`\377\377\377d\377"
+  "\377\377h\377\377\377k\377\377\377k\377\377\377k\377\377\377k\377\377\377"
+  "k\377\377\377k\377\377\377k\377\377\377p\377\377\377p\377\377\377p\377\377"
+  "\377p\377\377\377p\377\377\377p\377\377\377p\0\0\0\0\0\0\0\0\0\0\0\0\377"
+  "\377\377\6\377\377\377\14\377\377\377\22\314\314\314\35\377\377\377'\377"
+  "\377\3771\377\377\377>\357\357\357P\377\377\377]\363\363\363k\365\365\365"
+  "v\365\365\365|\377\377\377\202\367\367\367\210\367\367\367\214\367\367\367"
+  "\216\367\367\367\221\367\367\367\221\367\367\367\221\367\367\367\221\367"
+  "\367\367\221\367\367\367\221\367\367\367\224\367\367\367\224\367\367\367"
+  "\224\367\367\367\224\367\367\367\224\367\367\367\224\367\367\367\224\0\0"
+  "\0\0\0\0\0\0\377\377\377\6\377\377\377\6\377\377\377\22\377\377\377\27\377"
+  "\377\377'\377\377\3776\377\377\377I\377\377\377Y\377\377\377k\376\376\376"
+  "y\377\377\377\210\377\377\377\224\377\377\377\235\377\377\377\245\377\377"
+  "\377\253\377\377\377\255\377\377\377\262\377\377\377\262\377\377\377\263"
+  "\377\377\377\263\377\377\377\263\377\377\377\263\377\377\377\263\377\377"
+  "\377\266\377\377\377\266\377\377\377\266\377\377\377\266\377\377\377\266"
+  "\377\377\377\266\377\377\377\266\0\0\0\0\0\0\0\0\377\377\377\6\377\377\377"
+  "\14\377\377\377\27\377\377\377#\377\377\3771\377\377\377I\377\377\377]\377"
+  "\377\377r\377\377\377\205\377\377\377\231\377\377\377\247\377\377\377\263"
+  "\377\377\377\275\377\377\377\304\377\377\377\310\377\377\377\313\377\377"
+  "\377\316\377\377\377\320\377\377\377\320\377\377\377\320\377\377\377\320"
+  "\377\377\377\320\377\377\377\320\377\377\377\322\377\377\377\322\377\377"
+  "\377\322\377\377\377\322\377\377\377\322\377\377\377\322\377\377\377\322"
+  "\0\0\0\0\377\377\377\6\377\377\377\6\377\377\377\22\377\377\377\35\377\377"
+  "\377+\377\377\377>\377\377\377Y\377\377\377r\377\377\377\210\376\376\376"
+  "\237\377\377\377\262\377\377\377\302\377\377\377\313\377\377\377\324\377"
+  "\377\377\332\376\376\376\336\377\377\377\341\377\377\377\342\377\377\377"
+  "\344\377\377\377\344\377\377\377\344\377\377\377\344\377\377\377\344\377"
+  "\377\377\344\377\377\377\345\377\377\377\345\377\377\377\345\377\377\377"
+  "\345\377\377\377\345\377\377\377\345\377\377\377\345\0\0\0\0\377\377\377"
+  "\6\377\377\377\14\377\377\377\27\377\377\377#\377\377\3776\377\377\377P\377"
+  "\377\377k\377\377\377\205\376\376\376\237\372\372\372\266\377\377\377\307"
+  "\373\373\373\325\373\373\373\337\374\374\374\345\374\374\374\352\374\374"
+  "\374\355\374\374\374\357\374\374\374\360\374\374\374\361\374\374\374\361"
+  "\374\374\374\362\374\374\374\362\374\374\374\362\374\374\374\362\374\374"
+  "\374\362\374\374\374\362\374\374\374\362\374\374\374\362\374\374\374\362"
+  "\374\374\374\362\374\374\374\362\0\0\0\0\377\377\377\6\377\377\377\14\377"
+  "\377\377\35\377\377\377+\377\377\377C\377\377\377]\377\377\377|\377\377\377"
+  "\231\377\377\377\263\377\377\377\307\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377"
+  "\377\377\6\377\377\377\22\324\324\324#\377\377\3771\377\377\377L\363\363"
+  "\363k\377\377\377\210\377\377\377\247\377\377\377\302\377\377\377\325\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\377\377\377\6\377\377\377\14\377\377\377\22\377\377"
+  "\377#\377\377\377<\377\377\377U\377\377\377v\377\377\377\226\377\377\377"
+  "\263\377\377\377\315\377\377\377\337\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\377"
+  "\6\377\377\377\14\377\377\377\27\377\377\377'\377\377\377>\377\377\377]\377"
+  "\377\377|\370\370\370\237\377\377\377\275\373\373\373\325\377\377\377\345"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\377\377\377\6\377\377\377\14\377\377\377\27\377"
+  "\377\377+\377\377\377C\377\377\377`\377\377\377\202\377\377\377\247\377\377"
+  "\377\304\377\377\377\332\377\377\377\352\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377"
+  "\377\6\377\377\377\14\377\377\377\27\377\377\377+\377\377\377C\377\377\377"
+  "d\377\377\377\210\377\377\377\253\377\377\377\310\376\376\376\336\374\374"
+  "\374\355\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\377\6\377\377\377\14\377\377\377"
+  "\35\377\377\377+\377\377\377I\377\377\377h\377\377\377\214\377\377\377\260"
+  "\377\377\377\313\374\374\374\342\374\374\374\357\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\377\377\377\6\377\377\377\14\377\377\377\35\342\342\3421\377\377\377I\377"
+  "\377\377k\377\377\377\216\377\377\377\262\377\377\377\316\374\374\374\344"
+  "\377\377\377\360\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\377\6\377\377\377\14\377"
+  "\377\377\35\377\377\3771\377\377\377L\377\377\377k\377\377\377\221\377\377"
+  "\377\263\377\377\377\320\377\377\377\344\377\377\377\361\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\377\377\377\6\377\377\377\14\377\377\377\35\377\377\3771\377\377"
+  "\377L\377\377\377k\377\377\377\221\377\377\377\263\377\377\377\320\377\377"
+  "\377\344\374\374\374\362\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\377\6\377\377\377"
+  "\14\377\377\377\35\377\377\3771\377\377\377L\364\364\364p\377\377\377\221"
+  "\372\372\372\266\377\377\377\320\374\374\374\345\377\377\377\362\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\377\377\377\6\377\377\377\14\377\377\377\35\377\377\377"
+  "1\377\377\377L\377\377\377p\377\377\377\221\377\377\377\266\373\373\373\322"
+  "\377\377\377\345\377\377\377\362\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\377\6\377"
+  "\377\377\14\377\377\377\35\377\377\3771\377\377\377L\377\377\377p\377\377"
+  "\377\221\377\377\377\266\373\373\373\322\377\377\377\345\377\377\377\362"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\377\377\377\6\377\377\377\14\377\377\377\35\377"
+  "\377\3771\377\377\377L\377\377\377p\377\377\377\221\377\377\377\266\373\373"
+  "\373\322\377\377\377\345\377\377\377\362\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377"
+  "\377\6\377\377\377\14\377\377\377\35\377\377\3771\377\377\377L\377\377\377"
+  "p\367\367\367\224\377\377\377\266\377\377\377\322\377\377\377\345\374\374"
+  "\374\362\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\377\6\377\377\377\14\377\377\377"
+  "\35\377\377\3771\377\377\377L\377\377\377p\367\367\367\224\377\377\377\266"
+  "\377\377\377\322\377\377\377\345\374\374\374\362\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\377\377\377\6\377\377\377\14\377\377\377\35\377\377\3771\377\377\377L\377"
+  "\377\377p\367\367\367\224\377\377\377\266\377\377\377\322\377\377\377\345"
+  "\374\374\374\362\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\377\6\377\377\377\14\377"
+  "\377\377\35\377\377\3771\377\377\377L\377\377\377p\367\367\367\224\377\377"
+  "\377\266\377\377\377\322\377\377\377\345\374\374\374\362\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\377\377\377\6\377\377\377\14\377\377\377\35\377\377\3771\377\377"
+  "\377L\377\377\377p\367\367\367\224\377\377\377\266\377\377\377\322\377\377"
+  "\377\345\374\374\374\362\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\377\377\6\377\377\377"
+  "\14\377\377\377\35\377\377\3771\377\377\377L\377\377\377p\367\367\367\224"
+  "\377\377\377\266\377\377\377\322\377\377\377\345\374\374\374\362\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\377\377\377\6\377\377\377\14\377\377\377\35\377\377\377"
+  "1\377\377\377L\377\377\377p\367\367\367\224\377\377\377\266\377\377\377\322"
+  "\377\377\377\345\374\374\374\362\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+  "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0",
+};
+
+} // Namespace texture
+} // Namespace unity
+
+#endif

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-09-27 08:37:12 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-09-28 09:43:23 +0000
@@ -38,6 +38,7 @@
 #include "StartupNotifyService.h"
 #include "Timer.h"
 #include "KeyboardUtil.h"
+#include "glow_texture.h"
 #include "unityshell.h"
 #include "BackgroundEffectHelper.h"
 #include "UnityGestureBroker.h"
@@ -105,6 +106,19 @@
 
 const std::string RELAYOUT_TIMEOUT = "relayout-timeout";
 } // namespace local
+
+namespace scale
+{
+namespace decoration
+{
+const unsigned CLOSE_SIZE = 19;
+const unsigned ITEMS_PADDING = 5;
+const unsigned RADIUS = 8;
+const unsigned GLOW = 20;
+const nux::Color GLOW_COLOR(221, 72, 20);
+} // decoration namespace
+} // scale namespace
+
 } // anon namespace
 
 UnityScreen::UnityScreen(CompScreen* screen)
@@ -2477,6 +2491,15 @@
     uScreen->paintPanelShadow(region);
   }
 
+  if (WindowManager::Default()->IsScaleActive() && ScaleScreen::get(screen)->getSelectedWindow() == window->id())
+  {
+    if (!region.isEmpty())
+    {
+      double scale = ScaleWindow::get(window)->getCurrentPosition().scale;
+      glow::Quads const& quads = computeGlowQuads(glow_texture_, scale::decoration::GLOW, scale);
+      paintGlow(matrix, attrib, region, quads, glow_texture_, scale::decoration::GLOW_COLOR, mask);
+    }
+  }
 
   return ret;
 }
@@ -3386,16 +3409,7 @@
 GLTexture::List UnityWindow::close_normal_tex_;
 GLTexture::List UnityWindow::close_prelight_tex_;
 GLTexture::List UnityWindow::close_pressed_tex_;
-
-namespace scale
-{
-namespace decoration
-{
-const unsigned CLOSE_SIZE = 19;
-const unsigned ITEMS_PADDING = 5;
-const unsigned RADIUS = 8;
-}
-}
+GLTexture::List UnityWindow::glow_texture_;
 
 struct UnityWindow::CairoContext
 {
@@ -3674,10 +3688,10 @@
   if (!texture.empty())
     return;
 
+  CompString plugin("unityshell");
   auto& style = panel::Style::Instance();
   auto const& files = style.GetWindowButtonFileNames(panel::WindowButtonType::CLOSE, state);
 
-  CompString plugin("unityshell");
   for (std::string const& file : files)
   {
     CompString file_name = file;
@@ -3706,6 +3720,12 @@
   LoadCloseIcon(panel::WindowState::NORMAL, close_normal_tex_);
   LoadCloseIcon(panel::WindowState::PRELIGHT, close_prelight_tex_);
   LoadCloseIcon(panel::WindowState::PRESSED, close_pressed_tex_);
+
+  if (glow_texture_.empty())
+  {
+    CompSize size(texture::GLOW_SIZE, texture::GLOW_SIZE);
+    glow_texture_ = GLTexture::imageDataToTexture(texture::GLOW, size, GL_RGBA, GL_UNSIGNED_BYTE);
+  }
 }
 
 void UnityWindow::CleanupSharedTextures()
@@ -3713,6 +3733,7 @@
   close_normal_tex_.clear();
   close_prelight_tex_.clear();
   close_pressed_tex_.clear();
+  glow_texture_.clear();
 }
 
 void UnityWindow::CleanupCachedTextures()
@@ -3874,6 +3895,7 @@
   PluginAdapter::Default ()->OnWindowClosed(window);
 }
 
+
 /* vtable init */
 bool UnityPluginVTable::init()
 {

=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2012-09-24 18:30:57 +0000
+++ plugins/unityshell/src/unityshell.h	2012-09-28 09:43:23 +0000
@@ -64,6 +64,8 @@
 #include "HudController.h"
 #include "WindowMinimizeSpeedController.h"
 
+#include "unityshell_glow.h"
+
 namespace unity
 {
 
@@ -442,7 +444,11 @@
   void RenderDecoration(CairoContext const&, double aspect = 1.0f);
   void RenderText(CairoContext const&, int x, int y, int width, int height);
   void DrawTexture(GLTexture::List const& textures, GLWindowPaintAttrib const&,
-                   GLMatrix const&, unsigned mask, int x, int y, double scale = 1.0f);
+                   GLMatrix const&, unsigned mask, int x, int y, double aspect = 1.0f);
+
+  glow::Quads computeGlowQuads(GLTexture::List const& texture, int glow_size, double window_aspect = 1.0f);
+  void paintGlow(GLMatrix const&, GLWindowPaintAttrib const&, CompRegion const&,
+                 glow::Quads const&, GLTexture::List const&, nux::Color const&, unsigned mask);
 
   void BuildDecorationTexture();
   void CleanupCachedTextures();
@@ -458,6 +464,7 @@
   static GLTexture::List close_normal_tex_;
   static GLTexture::List close_prelight_tex_;
   static GLTexture::List close_pressed_tex_;
+  static GLTexture::List glow_texture_;
   GLTexture::List decoration_tex_;
   GLTexture::List decoration_selected_tex_;
   std::string decoration_title_;

=== added file 'plugins/unityshell/src/unityshell_glow.cpp'
--- plugins/unityshell/src/unityshell_glow.cpp	1970-01-01 00:00:00 +0000
+++ plugins/unityshell/src/unityshell_glow.cpp	2012-09-28 09:43:23 +0000
@@ -0,0 +1,406 @@
+/**
+ * Copyright : (C) 2006-2012 by Patrick Niklaus, Roi Cohen,
+ *                Danny Baumann, Sam Spilsbury
+ * Authors: Patrick Niklaus <[e-mail]>
+ *      Roi Cohen     <[e-mail]>
+ *      Danny Baumann   <[e-mail]>
+ *      Sam Spilsbury   <[e-mail]>
+ *      Marco Trevisan <[e-mail]>
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ **/
+
+#include <Nux/Nux.h>
+#include "unityshell.h"
+#include "glow_texture.h"
+#include "unityshell_glow.h"
+
+namespace unity
+{
+
+/*
+ * UnityWindow::paintGlow
+ *
+ * Takes our glow texture, stretches the appropriate positions in the glow texture,
+ * adds those geometries (so plugins like wobby and deform this texture correctly)
+ * and then draws the glow texture with this geometry (plugins like wobbly and friends
+ * will automatically deform the texture based on our set geometry)
+ */
+
+void
+UnityWindow::paintGlow(GLMatrix const& transform, GLWindowPaintAttrib const& attrib,
+                       CompRegion const& paintRegion, glow::Quads const& glow_quads,
+                       GLTexture::List const& outline_texture, nux::Color const& color,
+                       unsigned mask)
+{
+  GLushort colorData[4];
+  colorData[0] = color.red * 0xffff;
+  colorData[1] = color.green * 0xffff;
+  colorData[2] = color.blue * 0xffff;
+  colorData[3] = color.alpha * 0xffff;
+
+  gWindow->vertexBuffer()->begin ();
+
+  /* There are 8 glow parts of the glow texture which we wish to paint
+   * separately with different transformations
+   */
+  for (unsigned i = 0; i < unsigned(glow::QuadPos::LAST); ++i)
+  {
+    /* Using precalculated quads here */
+    glow::Quads::Quad const& quad = glow_quads[static_cast<glow::QuadPos>(i)];
+    CompRegion reg(quad.box);
+
+    if (reg.boundingRect().x1() < reg.boundingRect().x2() &&
+        reg.boundingRect().y1() < reg.boundingRect().y2())
+    {
+      GLTexture::MatrixList matl;
+      reg = CompRegion(reg.boundingRect().x1(), reg.boundingRect().y1(),
+                       reg.boundingRect().width(), reg.boundingRect().height());
+
+      matl.push_back(quad.matrix);
+
+      /* Add color data for all 6 vertices of the quad */
+      for (int n = 0; n < 6; n++)
+        gWindow->vertexBuffer()->addColors(1, colorData);
+
+      gWindow->glAddGeometry(matl, reg, reg);
+    }
+  }
+
+  if (gWindow->vertexBuffer()->end())
+  {
+    glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+    /* we use PAINT_WINDOW_TRANSFORMED_MASK here to force
+    the usage of a good texture filter */
+    for (GLTexture *tex : outline_texture)
+    {
+      mask |= PAINT_WINDOW_BLEND_MASK | PAINT_WINDOW_TRANSLUCENT_MASK | PAINT_WINDOW_TRANSFORMED_MASK;
+      gWindow->glDrawTexture(tex, transform, attrib, mask);
+    }
+
+    glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+    GLScreen::get(screen)->setTexEnvMode (GL_REPLACE);
+  }
+}
+
+/*
+ * UnityWindow::computeGlowQuads
+ *
+ * This function computures the matrix transformation required for each
+ * part of the glow texture which we wish to stretch to some rectangular
+ * dimentions
+ *
+ * There are eight quads different parts of the texture which we wish to
+ * paint here, the 4 sides and four corners, eg:
+ *
+ *                  ------------------
+ *                  | 1 |   4    | 6 |
+ * -------------    ------------------
+ * | 1 | 4 | 6 |    |   |        |   |
+ * -------------    |   |        |   |
+ * | 2 | n | 7 | -> | 2 |   n    | 7 |
+ * -------------    |   |        |   |
+ * | 3 | 5 | 8 |    |   |        |   |
+ * -------------    ------------------
+ *                  | 3 |   5    | 8 |
+ *                  ------------------
+ *
+ * In this example here, 2, 4, 5 and 7 are stretched, and the matrices for
+ * each quad rect adjusted accordingly for it's size compared to the original
+ * texture size.
+ *
+ * When we are adjusting the matrices here, the initial size of each corner has
+ * a size of of "1.0f", so according to 2x2 matrix rules,
+ * while you will see here that matrix->xx is (1 / glowSize)
+ * where glowSize is the size the user specifies they want their glow to extend.
+ * (likewise, matrix->yy is adjusted similarly for corners and for top/bottom)
+ *
+ * matrix->x0 and matrix->y0 here are set to be the top left edge of the rect
+ * adjusted by the matrix scale factor (matrix->xx and matrix->yy)
+ *
+ */
+glow::Quads UnityWindow::computeGlowQuads(GLTexture::List const& texture, int glow_size, double window_aspect)
+{
+  glow::Quads glow_quads;
+
+  if (texture.empty())
+    return glow_quads;
+
+  int x1, x2, y1, y2;
+  int glow_offset;
+  CompRect const& border_rect = window->borderRect();
+  GLTexture::Matrix const& matrix = texture.front()->matrix();
+
+  CompRect *box;
+  GLTexture::Matrix *quadMatrix;
+
+  glow_size /= window_aspect;
+  glow_offset = (glow_size * texture::GLOW_OFFSET / texture::GLOW_SIZE) + 1;
+
+  /* Top left corner */
+  box = &glow_quads[glow::QuadPos::TOPLEFT].box;
+  glow_quads[glow::QuadPos::TOPLEFT].matrix = matrix;
+  quadMatrix = &glow_quads[glow::QuadPos::TOPLEFT].matrix;
+
+  /* Set the desired rect dimentions
+   * for the part of the glow we are painting */
+
+  x1 = border_rect.x() - glow_size + glow_offset;
+  y1 = border_rect.y() - glow_size + glow_offset;
+
+  /* 2x2 Matrix here, adjust both x and y scale factors
+   * and the x and y position
+   *
+   * Scaling both parts of the texture in a positive direction
+   * here (left to right top to bottom)
+   *
+   * The base position (x0 and y0) here requires us to move backwards
+   * on the x and y dimentions by the calculated rect dimentions
+   * multiplied by the scale factors
+   */
+
+  quadMatrix->xx = 1.0f / glow_size;
+  quadMatrix->yy = 1.0f / glow_size;
+  quadMatrix->x0 = -(x1 * quadMatrix->xx);
+  quadMatrix->y0 = -(y1 * quadMatrix->yy);
+
+  x2 = std::min<int>(border_rect.x() + glow_offset,
+        border_rect.x() + (border_rect.width() / 2));
+  y2 = std::min<int>(border_rect.y() + glow_offset,
+        border_rect.y() + (border_rect.height() / 2));
+
+  box->setGeometry(x1, y1, x2 - x1, y2 - y1);
+
+  /* Top right corner */
+  box = &glow_quads[glow::QuadPos::TOPRIGHT].box;
+  glow_quads[glow::QuadPos::TOPRIGHT].matrix = matrix;
+  quadMatrix = &glow_quads[glow::QuadPos::TOPRIGHT].matrix;
+
+  /* Set the desired rect dimentions
+   * for the part of the glow we are painting */
+
+  x1 = border_rect.x() + border_rect.width() - glow_offset;
+  y1 = border_rect.y() - glow_size + glow_offset;
+  x2 = border_rect.x() + border_rect.width() + glow_size - glow_offset;
+
+  /*
+   * 2x2 Matrix here, adjust both x and y scale factors
+   * and the x and y position
+   *
+   * Scaling the y part of the texture in a positive direction
+   * and the x part in a negative direction here
+   * (right to left top to bottom)
+   *
+   * The base position (x0 and y0) here requires us to move backwards
+   * on the y dimention and forwards on x by the calculated rect dimentions
+   * multiplied by the scale factors (since we are moving forward on x we
+   * need the inverse of that which is 1 - x1 * xx
+   */
+
+  quadMatrix->xx = -1.0f / glow_size;
+  quadMatrix->yy = 1.0f / glow_size;
+  quadMatrix->x0 = 1.0 - (x1 * quadMatrix->xx);
+  quadMatrix->y0 = -(y1 * quadMatrix->yy);
+
+  x1 = std::max<int>(border_rect.x() + border_rect.width() - glow_offset,
+        border_rect.x() + (border_rect.width() / 2));
+  y2 = std::min<int>(border_rect.y() + glow_offset,
+        border_rect.y() + (border_rect.height() / 2));
+
+  box->setGeometry(x1, y1, x2 - x1, y2 - y1);
+
+  /* Bottom left corner */
+  box = &glow_quads[glow::QuadPos::BOTTOMLEFT].box;
+  glow_quads[glow::QuadPos::BOTTOMLEFT].matrix = matrix;
+  quadMatrix = &glow_quads[glow::QuadPos::BOTTOMLEFT].matrix;
+
+  x1 = border_rect.x() - glow_size + glow_offset;
+  y1 = border_rect.y() + border_rect.height() - glow_offset;
+  x2 = border_rect.x() + glow_offset;
+  y2 = border_rect.y() + border_rect.height() + glow_size - glow_offset;
+
+  /* 2x2 Matrix here, adjust both x and y scale factors
+   * and the x and y position
+   *
+   * Scaling the x part of the texture in a positive direction
+   * and the y part in a negative direction here
+   * (left to right bottom to top)
+   *
+   * The base position (x0 and y0) here requires us to move backwards
+   * on the x dimention and forwards on y by the calculated rect dimentions
+   * multiplied by the scale factors (since we are moving forward on x we
+   * need the inverse of that which is 1 - y1 * yy
+   */
+
+  quadMatrix->xx = 1.0f / glow_size;
+  quadMatrix->yy = -1.0f / glow_size;
+  quadMatrix->x0 = -(x1 * quadMatrix->xx);
+  quadMatrix->y0 = 1.0f - (y1 * quadMatrix->yy);
+
+  y1 = std::max<int>(border_rect.y() + border_rect.height() - glow_offset,
+        border_rect.y() + (border_rect.height() / 2));
+  x2 = std::min<int>(border_rect.x() + glow_offset,
+        border_rect.x() + (border_rect.width() / 2));
+
+  box->setGeometry(x1, y1, x2 - x1, y2 - y1);
+
+  /* Bottom right corner */
+  box = &glow_quads[glow::QuadPos::BOTTOMRIGHT].box;
+  glow_quads[glow::QuadPos::BOTTOMRIGHT].matrix = matrix;
+  quadMatrix = &glow_quads[glow::QuadPos::BOTTOMRIGHT].matrix;
+
+  x1 = border_rect.x() + border_rect.width() - glow_offset;
+  y1 = border_rect.y() + border_rect.height() - glow_offset;
+  x2 = border_rect.x() + border_rect.width() + glow_size - glow_offset;
+  y2 = border_rect.y() + border_rect.height() + glow_size - glow_offset;
+
+  /* 2x2 Matrix here, adjust both x and y scale factors
+   * and the x and y position
+   *
+   * Scaling the both parts of the texture in a negative direction
+   * (right to left bottom to top)
+   *
+   * The base position (x0 and y0) here requires us to move forwards
+   * on both dimentions by the calculated rect dimentions
+   * multiplied by the scale factors
+   */
+
+  quadMatrix->xx = -1.0f / glow_size;
+  quadMatrix->yy = -1.0f / glow_size;
+  quadMatrix->x0 = 1.0 - (x1 * quadMatrix->xx);
+  quadMatrix->y0 = 1.0 - (y1 * quadMatrix->yy);
+
+  x1 = std::max<int>(border_rect.x() + border_rect.width() - glow_offset,
+        border_rect.x() + (border_rect.width() / 2));
+  y1 = std::max<int>(border_rect.y() + border_rect.height() - glow_offset,
+        border_rect.y() + (border_rect.height() / 2));
+
+  box->setGeometry(x1, y1, x2 - x1, y2 - y1);
+
+  /* Top edge */
+  box = &glow_quads[glow::QuadPos::TOP].box;
+  glow_quads[glow::QuadPos::TOP].matrix = matrix;
+  quadMatrix = &glow_quads[glow::QuadPos::TOP].matrix;
+
+  x1 = border_rect.x() + glow_offset;
+  y1 = border_rect.y() - glow_size + glow_offset;
+  x2 = border_rect.x() + border_rect.width() - glow_offset;
+  y2 = border_rect.y() + glow_offset;
+
+  /* 2x2 Matrix here, adjust both x and y scale factors
+   * and the x and y position
+   *
+   * No need to scale the x part of the texture here, but we
+   * are scaling on the y part in a positive direciton
+   *
+   * The base position (y0) here requires us to move backwards
+   * on the x dimention and forwards on y by the calculated rect dimentions
+   * multiplied by the scale factors
+   */
+
+  quadMatrix->xx = 0.0f;
+  quadMatrix->yy = 1.0f / glow_size;
+  quadMatrix->x0 = 1.0;
+  quadMatrix->y0 = -(y1 * quadMatrix->yy);
+
+  box->setGeometry(x1, y1, x2 - x1, y2 - y1);
+
+  /* Bottom edge */
+  box = &glow_quads[glow::QuadPos::BOTTOM].box;
+  glow_quads[glow::QuadPos::BOTTOM].matrix = matrix;
+  quadMatrix = &glow_quads[glow::QuadPos::BOTTOM].matrix;
+
+  x1 = border_rect.x() + glow_offset;
+  y1 = border_rect.y() + border_rect.height() - glow_offset;
+  x2 = border_rect.x() + border_rect.width() - glow_offset;
+  y2 = border_rect.y() + border_rect.height() + glow_size - glow_offset;
+
+  /* 2x2 Matrix here, adjust both x and y scale factors
+   * and the x and y position
+   *
+   * No need to scale the x part of the texture here, but we
+   * are scaling on the y part in a negative direciton
+   *
+   * The base position (y0) here requires us to move forwards
+   * on y by the calculated rect dimentions
+   * multiplied by the scale factors
+   */
+
+  quadMatrix->xx = 0.0f;
+  quadMatrix->yy = -1.0f / glow_size;
+  quadMatrix->x0 = 1.0;
+  quadMatrix->y0 = 1.0 - (y1 * quadMatrix->yy);
+
+  box->setGeometry(x1, y1, x2 - x1, y2 - y1);
+
+  /* Left edge */
+  box = &glow_quads[glow::QuadPos::LEFT].box;
+  glow_quads[glow::QuadPos::LEFT].matrix = matrix;
+  quadMatrix = &glow_quads[glow::QuadPos::LEFT].matrix;
+
+  x1 = border_rect.x() - glow_size + glow_offset;
+  y1 = border_rect.y() + glow_offset;
+  x2 = border_rect.x() + glow_offset;
+  y2 = border_rect.y() + border_rect.height() - glow_offset;
+
+  /* 2x2 Matrix here, adjust both x and y scale factors
+   * and the x and y position
+   *
+   * No need to scale the y part of the texture here, but we
+   * are scaling on the x part in a positive direciton
+   *
+   * The base position (x0) here requires us to move backwards
+   * on x by the calculated rect dimentions
+   * multiplied by the scale factors
+   */
+
+  quadMatrix->xx = 1.0f / glow_size;
+  quadMatrix->yy = 0.0f;
+  quadMatrix->x0 = -(x1 * quadMatrix->xx);
+  quadMatrix->y0 = 1.0;
+
+  box->setGeometry(x1, y1, x2 - x1, y2 - y1);
+
+  /* Right edge */
+  box = &glow_quads[glow::QuadPos::RIGHT].box;
+  glow_quads[glow::QuadPos::RIGHT].matrix = matrix;
+  quadMatrix = &glow_quads[glow::QuadPos::RIGHT].matrix;
+
+  x1 = border_rect.x() + border_rect.width() - glow_offset;
+  y1 = border_rect.y() + glow_offset;
+  x2 = border_rect.x() + border_rect.width() + glow_size - glow_offset;
+  y2 = border_rect.y() + border_rect.height() - glow_offset;
+
+  /* 2x2 Matrix here, adjust both x and y scale factors
+   * and the x and y position
+   *
+   * No need to scale the y part of the texture here, but we
+   * are scaling on the x part in a negative direciton
+   *
+   * The base position (x0) here requires us to move forwards
+   * on x by the calculated rect dimentions
+   * multiplied by the scale factors
+   */
+
+  quadMatrix->xx = -1.0f / glow_size;
+  quadMatrix->yy = 0.0f;
+  quadMatrix->x0 = 1.0 - (x1 * quadMatrix->xx);
+  quadMatrix->y0 = 1.0;
+
+  box->setGeometry(x1, y1, x2 - x1, y2 - y1);
+
+  return glow_quads;
+}
+
+} // Unity namespace

=== added file 'plugins/unityshell/src/unityshell_glow.h'
--- plugins/unityshell/src/unityshell_glow.h	1970-01-01 00:00:00 +0000
+++ plugins/unityshell/src/unityshell_glow.h	2012-09-28 09:43:23 +0000
@@ -0,0 +1,71 @@
+/**
+ * Copyright : (C) 2006-2012 by Patrick Niklaus, Roi Cohen,
+ *              Danny Baumann, Sam Spilsbury
+ * Authors: Patrick Niklaus <[e-mail]>
+ *          Roi Cohen       <[e-mail]>
+ *          Danny Baumann   <[e-mail]>
+ *          Sam Spilsbury   <[e-mail]>
+ *          Marco Trevisan <[e-mail]>
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ **/
+
+#ifndef _UNITYSHELL_GLOW_H
+#define _UNITYSHELL_GLOW_H
+
+#include <core/core.h>
+#include <opengl/opengl.h>
+
+namespace unity
+{
+namespace glow
+{
+
+enum class QuadPos
+{
+  TOPLEFT = 0,
+  TOPRIGHT,
+  BOTTOMLEFT,
+  BOTTOMRIGHT,
+  TOP,
+  BOTTOM,
+  LEFT,
+  RIGHT,
+  LAST
+};
+
+struct Quads
+{
+/* Each glow quad contains a 2x2 scale + positional matrix
+ * (the 3rd column is not used since that is for matrix skew
+ *  operations which we do not care about)
+ * and also a CompRect which describes the size and position of
+ * the quad on the glow
+ */
+  struct Quad
+  {
+    CompRect box;
+    GLTexture::Matrix matrix;
+  };
+
+  Quad& operator[](QuadPos position) { return inner_vector_[unsigned(position)]; }
+  Quad const& operator[](QuadPos position) const { return inner_vector_[unsigned(position)]; }
+
+private:
+  Quad inner_vector_[unsigned(QuadPos::LAST)];
+};
+
+} // namespace glow
+} // namepsace unity
+
+#endif