diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2005-09-13 18:50:39 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-09-13 18:50:39 +0000 |
| commit | 4957e325c0d27e4a093fa70d3d2382a1b4558cbc (patch) | |
| tree | 2e876ea669f1371ad5739acfddbc382b35930265 /gtk/gtkimcontextsimple.c | |
| parent | d30ba09733508237617436718fbc9a0e43c50c9d (diff) | |
| download | gtk+-4957e325c0d27e4a093fa70d3d2382a1b4558cbc.tar.gz | |
Let GDK_Return pass through in some more cases.
2005-09-13 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkimcontextsimple.c (gtk_im_context_simple_filter_keypress):
Let GDK_Return pass through in some more cases.
* gtk/gtkentry.c (gtk_entry_key_press): Reset the im context before
activating the entry.
Diffstat (limited to 'gtk/gtkimcontextsimple.c')
| -rw-r--r-- | gtk/gtkimcontextsimple.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c index ac98ac0656..0bea1c646f 100644 --- a/gtk/gtkimcontextsimple.c +++ b/gtk/gtkimcontextsimple.c @@ -1384,7 +1384,11 @@ gtk_im_context_simple_filter_keypress (GtkIMContext *context, (context_simple->in_hex_sequence && !hex_keyval && !is_hex_start && !is_space && !is_backspace)) { - if (event->state & (gtk_accelerator_get_default_mod_mask () & ~GDK_SHIFT_MASK)) + if (event->state & (gtk_accelerator_get_default_mod_mask () & ~GDK_SHIFT_MASK) || + (context_simple->in_hex_sequence && context_simple->modifiers_dropped && + (event->keyval == GDK_Return || + event->keyval == GDK_ISO_Enter || + event->keyval == GDK_KP_Enter))) return FALSE; } |