* src/hildon-note.c (hildon_note_button_release): Use root coordinates to check if...

* src/hildon-app-menu.c
(hildon_app_menu_button_release):
Remove unnecessary check

* examples/hildon-app-menu-example.c
(button_clicked):
Add cast to fix warning

diff --git a/ChangeLog b/ChangeLog
index a15f147..c64c064 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2008-06-12  Alberto Garcia  <agarcia@igalia.com>
 
+       * src/hildon-note.c
+       (hildon_note_button_release):
+       Use root coordinates to check if the release event happened
+       outside the widget.
+
+       * src/hildon-app-menu.c
+       (hildon_app_menu_button_release):
+       Remove unnecessary check
+
+       * examples/hildon-app-menu-example.c
+       (button_clicked):
+       Add cast to fix warning
+
        * src/hildon-app-menu.c
        (hildon_app_menu_class_init):
        New inner-border style property.

diff --git a/examples/hildon-app-menu-example.c b/examples/hildon-app-menu-example.c
index c72ad66..647a147 100644 (file)
--- a/examples/hildon-app-menu-example.c
+++ b/examples/hildon-app-menu-example.c
@@ -85,7 +85,7 @@ static void
 button_clicked                                  (GtkButton *button,
                                                  HildonAppMenu *menu)
 {
-    gtk_widget_show (menu);
+    gtk_widget_show (GTK_WIDGET (menu));
 }
 
 static void

diff --git a/src/hildon-app-menu.c b/src/hildon-app-menu.c
index 0f07d04..5902871 100644 (file)
--- a/src/hildon-app-menu.c
+++ b/src/hildon-app-menu.c
@@ -281,13 +281,11 @@ hildon_app_menu_button_release                  (GtkWidget *widget,
 {
     int x, y;
     gboolean released_outside;
-    HildonAppMenuPrivate *priv = HILDON_APP_MENU_GET_PRIVATE(widget);
 
     gdk_window_get_position (widget->window, &x, &y);
 
     /* Whether the button has been released outside the widget */
-    released_outside = (event->window != priv->transfer_window ||
-                        event->x_root < x || event->x_root > x + widget->allocation.width ||
+    released_outside = (event->x_root < x || event->x_root > x + widget->allocation.width ||
                         event->y_root < y || event->y_root > y + widget->allocation.height);
 
     if (released_outside) {

diff --git a/src/hildon-note.c b/src/hildon-note.c
index c513426..eb68b2d 100644 (file)
--- a/src/hildon-note.c
+++ b/src/hildon-note.c
@@ -440,9 +440,8 @@ hildon_note_button_release                      (GtkWidget *widget,
     gdk_window_get_position (widget->window, &x, &y);
 
     /* Whether the button has been released outside the widget */
-    released_outside = (event->window != priv->transfer_window ||
-                        event->x < x || event->x > x + widget->allocation.width ||
-                        event->y < y || event->y > y + widget->allocation.height);
+    released_outside = (event->x_root < x || event->x_root > x + widget->allocation.width ||
+                        event->y_root < y || event->y_root > y + widget->allocation.height);
 
     if (released_outside && priv->close_if_pressed_outside) {
         gtk_dialog_response (GTK_DIALOG (widget), GTK_RESPONSE_CANCEL);