Merge lp:~marcus-lundgren/granite/fix-1062967 into lp:~elementary-pantheon/granite/granite

[Marcus Lundgren]

[David Gomes (davidgomes)]

if(on_close_button){
↓
if (on_close_button) {

Also, the following looks much better than what you have on line 9.

this.add_events (Gdk.EventMask.BUTTON_PRESS_MASK |
                 Gdk.EventMask.BUTTON_RELEASE_MASK |
                 Gdk.EventMask.POINTER_MOTION_MASK);

Also, please no trailing space like on line 34.

[David Gomes (davidgomes)]

Oops, here's the Needs Fixing.

review: Approve

[lp:~marcus-lundgren/granite/fix-1062967]

519. By Marcus Lundgren on 2013-01-14

Code style.

520. By Marcus Lundgren on 2013-01-14

Trailing whitespace.

[Cody Garver (codygarver)]

Woohoo!

review: Approve

=== modified file 'lib/Widgets/DecoratedWindow.vala'
--- lib/Widgets/DecoratedWindow.vala	2012-12-21 00:46:56 +0000
+++ lib/Widgets/DecoratedWindow.vala	2013-01-14 20:28:19 +0000
@@ -137,7 +137,9 @@
             this.box.pack_start (this._title, false);
             base.add (this.box);
 
-            this.add_events (Gdk.EventMask.BUTTON_PRESS_MASK | Gdk.EventMask.POINTER_MOTION_MASK);
+            this.add_events (Gdk.EventMask.BUTTON_PRESS_MASK |
+                             Gdk.EventMask.BUTTON_RELEASE_MASK |
+                             Gdk.EventMask.POINTER_MOTION_MASK);
             this.motion_notify_event.connect (on_motion_notify);
             this.delete_event.connect_after (on_delete_event);
             this.size_allocate.connect (on_size_allocate);
@@ -217,8 +219,6 @@
 
         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;
             }
 
@@ -227,7 +227,13 @@
         }
 
         public override bool button_release_event (Gdk.EventButton e) {
-            return coords_over_close_button (e.x, e.y);
+            bool on_close_button = coords_over_close_button (e.x, e.y);
+            if(on_close_button) {
+                var event = (Gdk.Event*) (&e);
+                this.delete_event (event->any);
+            }
+
+            return on_close_button;
         }
 
         private bool coords_over_close_button (double x, double y) {