eventcontrollermotion: Add getters for the properties

... and use them.

Also, rename them from is/contains-pointer-focus to is/contains-pointer,
that's clear enough and not too long.

Finally, adapt the semantics of contains-pointer to mirror
GtkEventControllerKey::contains-focus. If is-pointer is set, so is
contains-pointer, they are not exclusive.
Which is what all users of this property wanted, too.

1 files changed, 1 insertions, 8 deletions

diff --git a/gtk/gtkpopovermenu.c b/gtk/gtkpopovermenu.c
index 369c9d6360..62993b51e3 100644
--- a/gtk/gtkpopovermenu.c
+++ b/gtk/gtkpopovermenu.c
@@ -237,17 +237,10 @@ leave_cb (GtkEventController *controller,
           gpointer            data)
 {
   GtkWidget *target;
-  gboolean is;
-  gboolean contains;
 
   target = gtk_event_controller_get_widget (controller);
 
-  g_object_get (controller,
-                "is-pointer-focus", &is,
-                "contains-pointer-focus", &contains,
-                NULL);
-
-  if (!(is || contains))
+  if (!gtk_event_controller_motion_contains_pointer (GTK_EVENT_CONTROLLER_MOTION (controller)))
     gtk_popover_menu_set_active_item (GTK_POPOVER_MENU (target), NULL);
 }