AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-02 17:00:19 +00:00
Code Issues Projects Releases Wiki Activity

gtkcalendar: Use key controller to track focus changes

Browse Source
This commit is contained in:
Carlos Garnacho 2018-03-23 16:09:37 +01:00
parent b0cd5cd7c8
commit 73fe140b10
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
gtk/gtkcalendar.c
View File

@ -301,8 +301,8 @@ static gboolean gtk_calendar_key_controller_key_pressed (GtkEventControllerKey *
guint keycode,
GdkModifierType state,
GtkWidget *widget);
static gboolean gtk_calendar_event (GtkWidget *widget,
GdkEvent *event);
static void gtk_calendar_key_controller_focus (GtkEventControllerKey *controller,
GtkWidget *widget);
static void gtk_calendar_grab_notify (GtkWidget *widget,
gboolean was_grabbed);
static void gtk_calendar_state_flags_changed (GtkWidget *widget,
@ -380,7 +380,6 @@ gtk_calendar_class_init (GtkCalendarClass *class)
widget_class->size_allocate = gtk_calendar_size_allocate;
widget_class->state_flags_changed = gtk_calendar_state_flags_changed;
widget_class->grab_notify = gtk_calendar_grab_notify;
widget_class->event = gtk_calendar_event;
widget_class->query_tooltip = gtk_calendar_query_tooltip;
widget_class->drag_data_get = gtk_calendar_drag_data_get;
@ -694,6 +693,12 @@ gtk_calendar_init (GtkCalendar *calendar)
g_signal_connect (priv->key_controller, "key-pressed",
G_CALLBACK (gtk_calendar_key_controller_key_pressed),
calendar);
g_signal_connect (priv->key_controller, "focus-in",
G_CALLBACK (gtk_calendar_key_controller_focus),
calendar);
g_signal_connect (priv->key_controller, "focus-out",
G_CALLBACK (gtk_calendar_key_controller_focus),
calendar);
if (!default_abbreviated_dayname[0])
for (i=0; i<7; i++)
@ -2870,6 +2875,17 @@ gtk_calendar_key_controller_key_pressed (GtkEventControllerKey *controller,
return return_val;
}
static void
gtk_calendar_key_controller_focus (GtkEventControllerKey *key,
GtkWidget *widget)
{
GtkCalendar *calendar = GTK_CALENDAR (widget);
calendar_queue_refresh (calendar);
calendar_stop_spinning (calendar);
calendar->priv->in_drag = 0;
}
/****************************************
* Misc widget methods *
@ -2897,23 +2913,6 @@ gtk_calendar_grab_notify (GtkWidget *widget,
calendar_stop_spinning (GTK_CALENDAR (widget));
}
static gboolean
gtk_calendar_event (GtkWidget *widget,
GdkEvent *event)
{
GtkCalendar *calendar = GTK_CALENDAR (widget);
if (gdk_event_get_event_type (event) == GDK_FOCUS_CHANGE)
{
calendar_queue_refresh (calendar);
calendar_stop_spinning (calendar);
calendar->priv->in_drag = 0;
}
return GDK_EVENT_PROPAGATE;
}
/****************************************
* Drag and Drop *