diff options
| author | Hans Petter Jansson <hpj@ximian.com> | 2003-04-24 06:03:57 +0800 |
|---|---|---|
| committer | Hans Petter <hansp@src.gnome.org> | 2003-04-24 06:03:57 +0800 |
| commit | 00566a768f8a6204651ddaf8add226aa315807e8 (patch) | |
| tree | de7ccf00b9fdd25d485e5b9015ec40a79d07dbbb /calendar/gui/e-week-view.c | |
| parent | d6d875d02faf911e1b4ddb1cfe9b1eb44b009b95 (diff) | |
| download | gsoc2013-evolution-00566a768f8a6204651ddaf8add226aa315807e8.tar.gz gsoc2013-evolution-00566a768f8a6204651ddaf8add226aa315807e8.tar.zst gsoc2013-evolution-00566a768f8a6204651ddaf8add226aa315807e8.zip | |
Fixes #41641
2003-04-23 Hans Petter Jansson <hpj@ximian.com>
Fixes #41641
* gui/e-day-view.c (e_day_view_focus_in): Remove assert an old
input method code.
(e_day_view_focus_out): Ditto.
(e_day_view_reshape_long_event): Set input method context.
(e_day_view_reshape_day_event): Ditto.
(e_day_view_on_editing_started): Let EText handle the context popup.
(e_day_view_on_editing_stopped): Turn off EText's handling of context
popup.
* gui/e-week-view.c (e_week_view_reshape_event_span): Set input
method context.
(e_week_view_on_text_item_event): Let the EText item handle
right-click context popup if we're editing it.
(e_week_view_on_editing_started): Let the EText item handle the
context popup.
(e_weeK_view_on_editing_stopped): Turn off EText's handling of
context popup.
svn path=/trunk/; revision=20947
Diffstat (limited to 'calendar/gui/e-week-view.c')
| -rw-r--r-- | calendar/gui/e-week-view.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c index 649da416f9..8ab0b44b1c 100644 --- a/calendar/gui/e-week-view.c +++ b/calendar/gui/e-week-view.c @@ -2750,6 +2750,7 @@ e_week_view_reshape_event_span (EWeekView *week_view, "text", text.value ? text.value : "", "use_ellipsis", TRUE, "fill_color_rgba", GNOME_CANVAS_COLOR(0, 0, 0), + "im_context", E_CANVAS (week_view->main_canvas)->im_context, NULL); g_signal_connect (span->text_item, "event", G_CALLBACK (e_week_view_on_text_item_event), @@ -3100,7 +3101,7 @@ e_week_view_on_text_item_event (GnomeCanvasItem *item, &event_num, &span_num)) return FALSE; - if (gdkevent->button.button == 3) { + if (gdkevent->button.button == 3 && !E_TEXT (item)->editing) { EWeekViewEvent *e; gboolean destroyed; @@ -3127,8 +3128,10 @@ e_week_view_on_text_item_event (GnomeCanvasItem *item, return TRUE; } - week_view->pressed_event_num = event_num; - week_view->pressed_span_num = span_num; + if (gdkevent->button.button != 3) { + week_view->pressed_event_num = event_num; + week_view->pressed_span_num = span_num; + } /* Only let the EText handle the event while editing. */ if (!E_TEXT (item)->editing) { @@ -3214,6 +3217,8 @@ e_week_view_on_editing_started (EWeekView *week_view, span_num); } + g_object_set (item, "handle_popup", TRUE, NULL); + gtk_signal_emit (GTK_OBJECT (week_view), e_week_view_signals[SELECTION_CHANGED]); } @@ -3252,6 +3257,7 @@ e_week_view_on_editing_stopped (EWeekView *week_view, if (!uid) return; + g_object_set (span->text_item, "handle_popup", FALSE, NULL); g_object_get (G_OBJECT (span->text_item), "text", &text, NULL); g_assert (text != NULL); |