Merge lp:~julien-spautz/granite/1134672 into lp:~elementary-pantheon/granite/granite

[Julien Spautz]

fixes bug #1134672 by doing what victor proposed: https://bugs.launchpad.net/granite/+bug/1134672/comments/4

[David Gomes (davidgomes)]

review: Approve

[David Gomes (davidgomes)]

Good code, fixed the bug perfectly.

Good job!

=== modified file 'lib/Widgets/DecoratedWindow.vala'
--- lib/Widgets/DecoratedWindow.vala	2013-01-14 20:26:07 +0000
+++ lib/Widgets/DecoratedWindow.vala	2013-03-18 17:30:37 +0000
@@ -235,6 +235,15 @@
 
             return on_close_button;
         }
+        
+        public override bool key_press_event (Gdk.EventKey event) {
+            if (event.keyval == Gdk.Key.Escape) {
+                this.delete_event (((Gdk.Event*) (&event))->any);
+                return true;
+            }
+            
+            return base.key_press_event (event);
+        }
 
         private bool coords_over_close_button (double x, double y) {
             return this.deletable &&

=== modified file 'lib/Widgets/LightWindow.vala'
--- lib/Widgets/LightWindow.vala	2013-01-01 23:46:39 +0000
+++ lib/Widgets/LightWindow.vala	2013-03-18 17:30:37 +0000
@@ -35,14 +35,7 @@
         public LightWindow (string title = "") {
             base (title, StyleClass.CONTENT_VIEW_WINDOW, StyleClass.CONTENT_VIEW);
         }
-
-        public override bool key_press_event (Gdk.EventKey event) {
-            if (event.keyval == Gdk.Key.Escape) {
-                this.delete_event (((Gdk.Event*) (&event))->any);
-                return true;
-            }
-            return base.key_press_event (event);
-        }
+        
     }
 
 }