AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-15 05:00:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'crossing-details' into 'master'

Browse Source 
motion controller: add details to signals

See merge request GNOME/gtk!621
This commit is contained in:
Matthias Clasen 2019-03-18 01:49:45 +00:00
commit b40743121b
3 changed files with 219 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/reference/gtk/gtk4-sections.txt
View File

@ -6684,6 +6684,8 @@ gtk_event_controller_scroll_get_type
<TITLE>GtkEventControllerMotion</TITLE>
GtkEventControllerMotion
gtk_event_controller_motion_new
gtk_event_controller_motion_get_pointer_origin
gtk_event_controller_motion_get_pointer_target
<SUBSECTION Standard>
GTK_TYPE_EVENT_CONTROLLER_MOTION

217
gtk/gtkeventcontrollermotion.c
View File

@ -29,7 +29,8 @@
#include "config.h"
#include "gtkintl.h"
#include "gtkwidget.h"
#include "gtkprivate.h"
#include "gtkwidgetprivate.h"
#include "gtkeventcontrollerprivate.h"
#include "gtkeventcontrollermotion.h"
#include "gtktypebuiltins.h"
@ -38,6 +39,11 @@
struct _GtkEventControllerMotion
{
GtkEventController parent_instance;
const GdkEvent *current_event;
guint is_pointer_focus : 1;
guint contains_pointer_focus : 1;
};
struct _GtkEventControllerMotionClass
@ -52,14 +58,67 @@ enum {
N_SIGNALS
};
enum {
PROP_IS_POINTER_FOCUS = 1,
PROP_CONTAINS_POINTER_FOCUS,
NUM_PROPERTIES
};
static GParamSpec *props[NUM_PROPERTIES] = { NULL, };
static guint signals[N_SIGNALS] = { 0 };
G_DEFINE_TYPE (GtkEventControllerMotion, gtk_event_controller_motion, GTK_TYPE_EVENT_CONTROLLER)
static void
update_pointer_focus (GtkEventControllerMotion *motion,
gboolean enter,
GdkNotifyType detail)
{
gboolean is_pointer;
gboolean contains_pointer;
switch (detail)
{
case GDK_NOTIFY_VIRTUAL:
case GDK_NOTIFY_NONLINEAR_VIRTUAL:
is_pointer = FALSE;
contains_pointer = enter;
break;
case GDK_NOTIFY_ANCESTOR:
case GDK_NOTIFY_NONLINEAR:
is_pointer = enter;
contains_pointer = FALSE;
break;
case GDK_NOTIFY_INFERIOR:
is_pointer = enter;
contains_pointer = !enter;
break;
case GDK_NOTIFY_UNKNOWN:
default:
g_warning ("Unknown crossing detail");
return;
}
g_object_freeze_notify (G_OBJECT (motion));
if (motion->is_pointer_focus != is_pointer)
{
motion->is_pointer_focus = is_pointer;
g_object_notify (G_OBJECT (motion), "is-pointer-focus");
}
if (motion->contains_pointer_focus != contains_pointer)
{
motion->contains_pointer_focus = contains_pointer;
g_object_notify (G_OBJECT (motion), "contains-pointer-focus");
}
g_object_thaw_notify (G_OBJECT (motion));
}
static gboolean
gtk_event_controller_motion_handle_event (GtkEventController *controller,
const GdkEvent *event)
{
GtkEventControllerMotion *motion = GTK_EVENT_CONTROLLER_MOTION (controller);
GtkEventControllerClass *parent_class;
GdkEventType type;
@ -67,17 +126,43 @@ gtk_event_controller_motion_handle_event (GtkEventController *controller,
if (type == GDK_ENTER_NOTIFY)
{
double x, y;
GdkCrossingMode mode;
GdkNotifyType detail;
gdk_event_get_coords (event, &x, &y);
g_signal_emit (controller, signals[ENTER], 0, x, y);
gdk_event_get_crossing_mode (event, &mode);
gdk_event_get_crossing_detail (event, &detail);
update_pointer_focus (motion, TRUE, detail);
motion->current_event = event;
g_signal_emit (controller, signals[ENTER], 0, x, y, mode, detail);
motion->current_event = NULL;
}
else if (type == GDK_LEAVE_NOTIFY)
{
g_signal_emit (controller, signals[LEAVE], 0);
GdkCrossingMode mode;
GdkNotifyType detail;
gdk_event_get_crossing_mode (event, &mode);
gdk_event_get_crossing_detail (event, &detail);
update_pointer_focus (motion, FALSE, detail);
motion->current_event = event;
g_signal_emit (controller, signals[LEAVE], 0, mode, detail);
motion->current_event = NULL;
}
else if (type == GDK_MOTION_NOTIFY)
{
double x, y;
gdk_event_get_coords (event, &x, &y);
g_signal_emit (controller, signals[MOTION], 0, x, y);
}
@ -86,13 +171,74 @@ gtk_event_controller_motion_handle_event (GtkEventController *controller,
return parent_class->handle_event (controller, event);
}
static void
gtk_event_controller_motion_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec)
{
GtkEventControllerMotion *controller = GTK_EVENT_CONTROLLER_MOTION (object);
switch (prop_id)
{
case PROP_IS_POINTER_FOCUS:
g_value_set_boolean (value, controller->is_pointer_focus);
break;
case PROP_CONTAINS_POINTER_FOCUS:
g_value_set_boolean (value, controller->contains_pointer_focus);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
}
}
static void
gtk_event_controller_motion_class_init (GtkEventControllerMotionClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GtkEventControllerClass *controller_class = GTK_EVENT_CONTROLLER_CLASS (klass);
object_class->get_property = gtk_event_controller_motion_get_property;
controller_class->handle_event = gtk_event_controller_motion_handle_event;
/**
* GtkEventControllerMotion:is-pointer-focus:
*
* Whether the pointer is in the controllers widget itself,
* as opposed to in a descendent widget. See
* #GtkEventControllerMotion:contains-pointer-focus.
*
* When handling crossing events, this property is updated
* before #GtkEventControllerMotion::enter or
* #GtkEventControllerMotion::leave are emitted.
*/
props[PROP_IS_POINTER_FOCUS] =
g_param_spec_boolean ("is-pointer-focus",
P_("Is Pointer Focus"),
P_("Whether the pointer is in the controllers widget"),
FALSE,
G_PARAM_READABLE);
/**
* GtkEventControllerMotion:contains-pointer-focus:
*
* Whether the pointer is in a descendant of the controllers widget.
* See #GtkEventControllerMotion:is-pointer-focus.
*
* When handling crossing events, this property is updated
* before #GtkEventControllerMotion::enter or
* #GtkEventControllerMotion::leave are emitted.
*/
props[PROP_CONTAINS_POINTER_FOCUS] =
g_param_spec_boolean ("contains-pointer-focus",
P_("Contains Pointer Focus"),
P_("Whether the pointer is in a descendant of the controllers widget"),
FALSE,
G_PARAM_READABLE);
/**
* GtkEventControllerMotion::enter:
* @controller: The object that received the signal
@ -107,7 +253,12 @@ gtk_event_controller_motion_class_init (GtkEventControllerMotionClass *klass)
G_SIGNAL_RUN_FIRST,
0, NULL, NULL,
NULL,
G_TYPE_NONE, 2, G_TYPE_DOUBLE, G_TYPE_DOUBLE);
G_TYPE_NONE,
4,
G_TYPE_DOUBLE,
G_TYPE_DOUBLE,
GDK_TYPE_CROSSING_MODE,
GDK_TYPE_NOTIFY_TYPE);
/**
* GtkEventControllerMotion::leave:
@ -121,7 +272,10 @@ gtk_event_controller_motion_class_init (GtkEventControllerMotionClass *klass)
G_SIGNAL_RUN_FIRST,
0, NULL, NULL,
NULL,
G_TYPE_NONE, 0);
G_TYPE_NONE,
2,
GDK_TYPE_CROSSING_MODE,
GDK_TYPE_NOTIFY_TYPE);
/**
* GtkEventControllerMotion::motion:
@ -158,3 +312,56 @@ gtk_event_controller_motion_new (void)
return g_object_new (GTK_TYPE_EVENT_CONTROLLER_MOTION,
NULL);
}
/**
* gtk_event_controller_motion_get_pointer_origin:
* @controller: a #GtkEventControllerMotion
*
* Returns the widget that contained the pointer before.
*
* This function can only be used in handlers for the
* #GtkEventControllerMotion::enter and
* #GtkEventControllerMotion::leave signals.
*
* Returns: (transfer none): the previous pointer focus
*/
GtkWidget *
gtk_event_controller_motion_get_pointer_origin (GtkEventControllerMotion *controller)
{
GtkWidget *origin;
g_return_val_if_fail (GTK_IS_EVENT_CONTROLLER_MOTION (controller), NULL);
g_return_val_if_fail (controller->current_event != NULL, NULL);
if (gdk_event_get_event_type (controller->current_event) == GDK_ENTER_NOTIFY)
origin = (GtkWidget *)gdk_event_get_related_target (controller->current_event);
else
origin = (GtkWidget *)gdk_event_get_target (controller->current_event);
return origin;
}
/**
* gtk_event_controller_motion_get_pointer_target:
* @controller: a #GtkEventControllerMotion
*
* Returns the widget that will contain the pointer afterwards.
*
* This function can only be used in handlers for the
* #GtkEventControllerMotion::enter and
* #GtkEventControllerMotion::leave signals.
*
* Returns: (transfer none): the next pointer focus
*/
GtkWidget *
gtk_event_controller_motion_get_pointer_target (GtkEventControllerMotion *controller)
{
g_return_val_if_fail (GTK_IS_EVENT_CONTROLLER_MOTION (controller), NULL);
g_return_val_if_fail (controller->current_event != NULL, NULL);
if (gdk_event_get_event_type (controller->current_event) == GDK_ENTER_NOTIFY)
return (GtkWidget *)gdk_event_get_target (controller->current_event);
else
return (GtkWidget *)gdk_event_get_related_target (controller->current_event);
}

5
gtk/gtkeventcontrollermotion.h
View File

@ -45,6 +45,11 @@ GType gtk_event_controller_motion_get_type (void) G_GNUC_CONST;
GDK_AVAILABLE_IN_ALL
GtkEventController *gtk_event_controller_motion_new (void);
GDK_AVAILABLE_IN_ALL
GtkWidget * gtk_event_controller_motion_get_pointer_origin (GtkEventControllerMotion *controller);
GDK_AVAILABLE_IN_ALL
GtkWidget * gtk_event_controller_motion_get_pointer_target (GtkEventControllerMotion *controller);
G_END_DECLS
#endif /* __GTK_EVENT_CONTROLLER_MOTION_H__ */