Merge lp:~victored/granite/lp-1062967 into lp:~elementary-pantheon/granite/granite

[Victor Martinez]

[Widgets.DecoratedWindow] When the close button (X) is clicked, don't propagate the button-release event to prevent the widgets underneath the window from receiving it. This revision also fixes a small memory leak when calling the delete-event. Fixes lp:1062967

Avoid propagating DecoratedWindow's button-release events to the widgets underneath. Fixes bug #1062967

Thanks in advance for the review :)

[lp:~victored/granite/lp-1062967]

420. By Victor Martinez on 2012-10-22

Fix crash. GtkWindow doesn't implement button_release_event

[Tom Beckmann (tombeckmann)]

review: Approve

=== modified file 'lib/Widgets/DecoratedWindow.vala'
--- lib/Widgets/DecoratedWindow.vala	2012-09-12 03:23:30 +0000
+++ lib/Widgets/DecoratedWindow.vala	2012-10-23 02:55:23 +0000
@@ -121,7 +121,6 @@
 
             this.add_events (Gdk.EventMask.BUTTON_PRESS_MASK | Gdk.EventMask.POINTER_MOTION_MASK);
             this.motion_notify_event.connect (on_motion_notify);
-            this.button_press_event.connect (on_button_press);
             this.delete_event.connect_after (on_delete_event);
             this.size_allocate.connect (on_size_allocate);
             this.draw.connect (draw_widget);
@@ -188,16 +187,19 @@
             return true;
         }
 
-        private bool on_button_press (Gdk.EventButton e) {
-                if (coords_over_close_button (e.x, e.y)) {
-                    var event = (Gdk.Event*)(&e);
-                    this.delete_event (event->copy ().any);
-                }
-                else {
-                    this.begin_move_drag ((int)e.button, (int)e.x_root, (int)e.y_root, e.time);
-                }
-
+        public override bool button_press_event (Gdk.EventButton e) {
+            if (coords_over_close_button (e.x, e.y)) {
+                var event = (Gdk.Event*) (&e);
+                this.delete_event (event->any);
                 return true;
+            }
+
+            this.begin_move_drag ((int) e.button, (int) e.x_root, (int) e.y_root, e.time);
+            return base.button_press_event (e);
+        }
+
+        public override bool button_release_event (Gdk.EventButton e) {
+            return coords_over_close_button (e.x, e.y);
         }
 
         private bool coords_over_close_button (double x, double y) {