[gtk+/wip/carlosg/event-delivery: 74/119] gtkbutton: Handle crossing events without the event window

[Timm Bäder <baedert src gnome org>]

commit ce8abe86cff69b1181c86cf91a960b4a199727b1
Author: Carlos Garnacho <carlosg gnome org>
Date:   Fri Mar 31 17:59:43 2017 +0200

    gtkbutton: Handle crossing events without the event window
    
    The event shall no longer be "directed" to the event window, but the
    widget. Getting a enter/leave event is enough now to know whether the
    pointer is inside or outside the widget.

 gtk/gtkbutton.c        |   18 +++++-------------
 gtk/gtkbuttonprivate.h |    1 -
 gtk/gtkmodelbutton.c   |   13 -------------
 3 files changed, 5 insertions(+), 27 deletions(-)
---
diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index df8e455..aa99d1f 100644
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -473,7 +473,7 @@ gtk_button_init (GtkButton *button)
   g_signal_connect (priv->gesture, "released", G_CALLBACK (multipress_released_cb), button);
   g_signal_connect (priv->gesture, "update", G_CALLBACK (multipress_gesture_update_cb), button);
   g_signal_connect (priv->gesture, "cancel", G_CALLBACK (multipress_gesture_cancel_cb), button);
-  gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (priv->gesture), GTK_PHASE_BUBBLE);
+  gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (priv->gesture), GTK_PHASE_CAPTURE);
 
   priv->gadget = gtk_css_custom_gadget_new_for_node (gtk_widget_get_css_node (GTK_WIDGET (button)),
                                                      GTK_WIDGET (button),
@@ -971,12 +971,8 @@ gtk_button_enter_notify (GtkWidget        *widget,
   GtkButton *button = GTK_BUTTON (widget);
   GtkButtonPrivate *priv = button->priv;
 
-  if ((event->window == button->priv->event_window) &&
-      (event->detail != GDK_NOTIFY_INFERIOR))
-    {
-      priv->in_button = TRUE;
-      gtk_button_update_state (button);
-    }
+  priv->in_button = TRUE;
+  gtk_button_update_state (button);
 
   return FALSE;
 }
@@ -988,12 +984,8 @@ gtk_button_leave_notify (GtkWidget        *widget,
   GtkButton *button = GTK_BUTTON (widget);
   GtkButtonPrivate *priv = button->priv;
 
-  if ((event->window == button->priv->event_window) &&
-      (event->detail != GDK_NOTIFY_INFERIOR))
-    {
-      priv->in_button = FALSE;
-      gtk_button_update_state (button);
-    }
+  priv->in_button = FALSE;
+  gtk_button_update_state (button);
 
   return FALSE;
 }
diff --git a/gtk/gtkbuttonprivate.h b/gtk/gtkbuttonprivate.h
index a9e93e0..fc04fe9 100644
--- a/gtk/gtkbuttonprivate.h
+++ b/gtk/gtkbuttonprivate.h
@@ -32,7 +32,6 @@ struct _GtkButtonPrivate
   GtkCssGadget          *gadget;
 
   GdkDevice             *grab_keyboard;
-  GdkWindow             *event_window;
 
   GtkGesture            *gesture;
 
diff --git a/gtk/gtkmodelbutton.c b/gtk/gtkmodelbutton.c
index baa568a..d7da4ba 100644
--- a/gtk/gtkmodelbutton.c
+++ b/gtk/gtkmodelbutton.c
@@ -883,19 +883,6 @@ gtk_model_button_allocate (GtkCssGadget        *gadget,
     (pango_font_metrics_get_ascent (metrics) + pango_font_metrics_get_descent (metrics));
   pango_font_metrics_unref (metrics);
 
-
-  if (gtk_widget_get_realized (widget))
-    {
-      GtkAllocation border_allocation;
-      gtk_css_gadget_get_border_allocation (gadget, &border_allocation, NULL);
-
-      gdk_window_move_resize (GTK_BUTTON (widget)->priv->event_window,
-                              border_allocation.x,
-                              border_allocation.y,
-                              border_allocation.width,
-                              border_allocation.height);
-    }
-
   gtk_container_get_children_clip (GTK_CONTAINER (widget), out_clip);
   gdk_rectangle_union (out_clip, &check_clip, out_clip);
 }