Attachment 911741 Details for Bug 1110370 – evo patch

[patch] evo patch

evo.patch (text/plain), 3.93 KB, created by Milan Crha on 2014-06-24 13:42:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Milan Crha

Created: 2014-06-24 13:42:22 UTC

Size: 3.93 KB

patch

obsolete

>Index: calendar/gui/e-calendar-view.c
>===================================================================
>--- calendar/gui/e-calendar-view.c	(revision 10)
>+++ calendar/gui/e-calendar-view.c	(working copy)
>@@ -1863,27 +1863,32 @@ e_calendar_view_send (ECalendarView *cal_view,
> 		g_object_unref (send_comp);
> }
> 
>+static void
>+tooltip_ungrab (ECalendarView *view,
>+		guint32 event_time)
>+{
>+	GdkDevice *keyboard;
>+
>+	while (!g_queue_is_empty (&view->priv->grabbed_keyboards)) {
>+		keyboard = g_queue_pop_head (&view->priv->grabbed_keyboards);
>+		gdk_device_ungrab (keyboard, event_time);
>+		g_object_unref (keyboard);
>+	}
>+}
>+
> static gboolean
>-tooltip_grab (GtkWidget *tooltip,
>-              GdkEvent *key_event,
>-              ECalendarView *view)
>+tooltip_key_event (GtkWidget *tooltip,
>+		   GdkEvent *key_event,
>+		   ECalendarView *view)
> {
> 	GtkWidget *widget;
>-	GdkDevice *keyboard;
>-	guint32 event_time;
> 
> 	widget = g_object_get_data (G_OBJECT (view), "tooltip-window");
> 	if (widget == NULL)
> 		return TRUE;
> 
>-	event_time = gdk_event_get_time (key_event);
>+	tooltip_ungrab (view, gdk_event_get_time (key_event));
> 
>-	while (!g_queue_is_empty (&view->priv->grabbed_keyboards)) {
>-		keyboard = g_queue_pop_head (&view->priv->grabbed_keyboards);
>-		gdk_device_ungrab (keyboard, event_time);
>-		g_object_unref (keyboard);
>-	}
>-
> 	gtk_widget_destroy (widget);
> 	g_object_set_data (G_OBJECT (view), "tooltip-window", NULL);
> 
>@@ -1949,6 +1954,16 @@ e_calendar_view_move_tip (GtkWidget *widget,
> 	gtk_widget_show (widget);
> }
> 
>+static void
>+tooltip_window_destroyed_cb (gpointer user_data,
>+			     GObject *gone)
>+{
>+	ECalendarView *view = user_data;
>+
>+	tooltip_ungrab (view, GDK_CURRENT_TIME);
>+	g_object_unref (view);
>+}
>+
> /*
>  * It is expected to show the tooltips in this below format
>  *
>@@ -2189,9 +2204,10 @@ e_calendar_view_get_tooltips (const ECalendarViewE
> 
> 	g_signal_connect (
> 		pevent->tooltip, "key-press-event",
>-		G_CALLBACK (tooltip_grab), data->cal_view);
>+		G_CALLBACK (tooltip_key_event), data->cal_view);
> 	pevent->timeout = -1;
> 
>+	g_object_weak_ref (G_OBJECT (pevent->tooltip), tooltip_window_destroyed_cb, g_object_ref (data->cal_view));
> 	g_object_set_data (G_OBJECT (data->cal_view), "tooltip-window", pevent->tooltip);
> 	g_object_unref (newcomp);
> 
>Index: calendar/gui/e-day-view.c
>===================================================================
>--- calendar/gui/e-day-view.c	(revision 10)
>+++ calendar/gui/e-day-view.c	(working copy)
>@@ -405,6 +405,7 @@ static void e_day_view_queue_layout (EDayView *day
> static void e_day_view_cancel_layout (EDayView *day_view);
> static gboolean e_day_view_layout_timeout_cb (gpointer data);
> static void tooltip_destroy (EDayView *day_view, GnomeCanvasItem *item);
>+static EDayViewEvent *tooltip_get_view_event (EDayView *day_view, gint day, gint event_num);
> 
> enum {
> 	PROP_0,
>@@ -4068,8 +4069,11 @@ e_day_view_show_popup_menu (EDayView *day_view,
>                             gint day,
>                             gint event_num)
> {
>-	tooltip_destroy (day_view, NULL);
>+	EDayViewEvent *pevent = tooltip_get_view_event (day_view, day, event_num);
> 
>+	if (pevent && pevent->canvas_item)
>+		tooltip_destroy (day_view, pevent->canvas_item);
>+
> 	day_view->popup_event_day = day;
> 	day_view->popup_event_num = event_num;
> 
>Index: calendar/gui/e-week-view.c
>===================================================================
>--- calendar/gui/e-week-view.c	(revision 10)
>+++ calendar/gui/e-week-view.c	(working copy)
>@@ -4709,6 +4709,14 @@ e_week_view_show_popup_menu (EWeekView *week_view,
>                              GdkEvent *button_event,
>                              gint event_num)
> {
>+	guint timeout;
>+
>+	timeout = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (week_view), "tooltip-timeout"));
>+	if (timeout) {
>+		g_source_remove (timeout);
>+		g_object_set_data (G_OBJECT (week_view), "tooltip-timeout", NULL);
>+	}
>+
> 	week_view->popup_event_num = event_num;
> 
> 	e_calendar_view_popup_event (E_CALENDAR_VIEW (week_view), button_event);

Actions: View | Diff

Attachments on bug 1110370: 911741