diff options
| author | Milan Crha <mcrha@redhat.com> | 2008-02-20 03:05:09 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@src.gnome.org> | 2008-02-20 03:05:09 +0800 |
| commit | ad7d90b2242ed1719d000de510acf56875c61ac7 (patch) | |
| tree | ebd588642a1659ccafdbffffc6ecdd3a79624408 | |
| parent | bbdb1887e18ddc02f0260067e68bb3e76dc101a2 (diff) | |
| download | gsoc2013-evolution-ad7d90b2242ed1719d000de510acf56875c61ac7.tar.gz gsoc2013-evolution-ad7d90b2242ed1719d000de510acf56875c61ac7.tar.zst gsoc2013-evolution-ad7d90b2242ed1719d000de510acf56875c61ac7.zip | |
** Fix for bug #209353
2008-02-19 Milan Crha <mcrha@redhat.com>
** Fix for bug #209353
* e-util/e-text-event-processor-emacs-like.c:
(e_text_event_processor_emacs_like_event):
Allow paste text on mouse middle button click.
* widgets/table/e-table-item.c: (eti_event):
Pass Home/End keys to cell when editing.
svn path=/trunk/; revision=35055
| -rw-r--r-- | e-util/ChangeLog | 8 | ||||
| -rw-r--r-- | e-util/e-text-event-processor-emacs-like.c | 6 | ||||
| -rw-r--r-- | widgets/table/ChangeLog | 7 | ||||
| -rw-r--r-- | widgets/table/e-table-item.c | 11 |
4 files changed, 28 insertions, 4 deletions
diff --git a/e-util/ChangeLog b/e-util/ChangeLog index 148f7350fe..a52c585e10 100644 --- a/e-util/ChangeLog +++ b/e-util/ChangeLog @@ -1,3 +1,11 @@ +2008-02-19 Milan Crha <mcrha@redhat.com> + + ** Fix for bug #209353 + + * e-text-event-processor-emacs-like.c: + (e_text_event_processor_emacs_like_event): + Allow paste text on mouse middle button click. + 2008-02-18 Milan Crha <mcrha@redhat.com> ** Part of fix for bug #515744 diff --git a/e-util/e-text-event-processor-emacs-like.c b/e-util/e-text-event-processor-emacs-like.c index dfde0cf446..e6416a78e9 100644 --- a/e-util/e-text-event-processor-emacs-like.c +++ b/e-util/e-text-event-processor-emacs-like.c @@ -131,18 +131,18 @@ e_text_event_processor_emacs_like_event (ETextEventProcessor *tep, ETextEventPro */ switch (event->type) { case GDK_BUTTON_PRESS: - if (event->button.button == 1) { + if (event->button.button == 1 || event->button.button == 2) { command.action = E_TEP_GRAB; command.time = event->button.time; g_signal_emit_by_name (tep, "command", &command); - if (event->button.state & GDK_SHIFT_MASK) + if (event->button.button == 1 && event->button.state & GDK_SHIFT_MASK) command.action = E_TEP_SELECT; else command.action = E_TEP_MOVE; command.position = E_TEP_VALUE; command.value = event->button.position; command.time = event->button.time; - tep_el->mouse_down = TRUE; + tep_el->mouse_down = event->button.button == 1; } break; case GDK_2BUTTON_PRESS: diff --git a/widgets/table/ChangeLog b/widgets/table/ChangeLog index f5c3455ba8..0c5a19abb6 100644 --- a/widgets/table/ChangeLog +++ b/widgets/table/ChangeLog @@ -1,3 +1,10 @@ +2008-02-19 Milan Crha <mcrha@redhat.com> + + ** Fix for bug #209353 + + * e-table-item.c: (eti_event): + Pass Home/End keys to cell when editing. + 2008-02-01 Milan Crha <mcrha@redhat.com> ** Fix for bug #512623 diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c index 62cfd3146b..232b852cad 100644 --- a/widgets/table/e-table-item.c +++ b/widgets/table/e-table-item.c @@ -2701,7 +2701,6 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e) break; } - g_signal_emit (eti, eti_signals [KEY_PRESS], 0, model_to_view_row(eti, cursor_row), cursor_col, e, &return_val); if ((!return_val) && @@ -2743,6 +2742,11 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e) break; case GDK_Home: case GDK_KP_Home: + if (eti_editing (eti)) { + handled = FALSE; + break; + } + if (eti->cursor_mode != E_CURSOR_LINE) { eti_cursor_move (eti, model_to_view_row(eti, cursor_row), 0); return_val = TRUE; @@ -2751,6 +2755,11 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e) break; case GDK_End: case GDK_KP_End: + if (eti_editing (eti)) { + handled = FALSE; + break; + } + if (eti->cursor_mode != E_CURSOR_LINE) { eti_cursor_move (eti, model_to_view_row(eti, cursor_row), eti->cols - 1); return_val = TRUE; |