Merge lp:~adam-davies/granite/fix-1089442 into lp:~elementary-pantheon/granite/granite

[Adam Davies]

Added close-on-escape.

[Tom Beckmann (tombeckmann)]

Maybe it'd be better to derive from GtkDialog instead of GtkWindow. This way we should get the close-on-escape for free and the wm would know better what the purpose of this window is.

review: Needs Fixing

[David Gomes (davidgomes)]

That's going to be a lot of work Tom. LightWindow inherits CompositedWindow, which can't be a Dialog. DecoratedWindow also can't be a Gtk.Dialog.

So, we'd have to write lots of new code to make LightWindow a Gtk.Dialog, because LightWindow is dependent on DecoratedWindow and CompositedWindow.

[Tom Beckmann (tombeckmann)]

Apparently it is more work than I expected it to be indeed. Noise is causing trouble as can be read in my merge proposal. So I approve this as a solution that can be considered fine for now.

review: Approve

=== modified file 'lib/Widgets/LightWindow.vala'
--- lib/Widgets/LightWindow.vala	2012-12-21 00:46:56 +0000
+++ lib/Widgets/LightWindow.vala	2013-01-01 23:48:20 +0000
@@ -36,6 +36,13 @@
             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);
+        }
     }
 
 }