Commit 8f05462d authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Call gtk_widget_activate for GDK_Return.

Sat Nov 11 23:07:30 2000  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkentry.c (gtk_entry_key_press): Call
	gtk_widget_activate for GDK_Return.

	* gtk/gtkentry.c (gtk_entry_preedit_changed_cb): Fix handling
	of preedit cursor position.
parent dfba2269
Sat Nov 11 23:07:30 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_key_press): Call
gtk_widget_activate for GDK_Return.
* gtk/gtkentry.c (gtk_entry_preedit_changed_cb): Fix handling
of preedit cursor position.
Sun Nov 5 04:24:53 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcellrenderertextpixbuf.c: Make parent_class
......
Sat Nov 11 23:07:30 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_key_press): Call
gtk_widget_activate for GDK_Return.
* gtk/gtkentry.c (gtk_entry_preedit_changed_cb): Fix handling
of preedit cursor position.
Sun Nov 5 04:24:53 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcellrenderertextpixbuf.c: Make parent_class
......
Sat Nov 11 23:07:30 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_key_press): Call
gtk_widget_activate for GDK_Return.
* gtk/gtkentry.c (gtk_entry_preedit_changed_cb): Fix handling
of preedit cursor position.
Sun Nov 5 04:24:53 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcellrenderertextpixbuf.c: Make parent_class
......
Sat Nov 11 23:07:30 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_key_press): Call
gtk_widget_activate for GDK_Return.
* gtk/gtkentry.c (gtk_entry_preedit_changed_cb): Fix handling
of preedit cursor position.
Sun Nov 5 04:24:53 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcellrenderertextpixbuf.c: Make parent_class
......
Sat Nov 11 23:07:30 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_key_press): Call
gtk_widget_activate for GDK_Return.
* gtk/gtkentry.c (gtk_entry_preedit_changed_cb): Fix handling
of preedit cursor position.
Sun Nov 5 04:24:53 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcellrenderertextpixbuf.c: Make parent_class
......
Sat Nov 11 23:07:30 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_key_press): Call
gtk_widget_activate for GDK_Return.
* gtk/gtkentry.c (gtk_entry_preedit_changed_cb): Fix handling
of preedit cursor position.
Sun Nov 5 04:24:53 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcellrenderertextpixbuf.c: Make parent_class
......
Sat Nov 11 23:07:30 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkentry.c (gtk_entry_key_press): Call
gtk_widget_activate for GDK_Return.
* gtk/gtkentry.c (gtk_entry_preedit_changed_cb): Fix handling
of preedit cursor position.
Sun Nov 5 04:24:53 2000 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcellrenderertextpixbuf.c: Make parent_class
......
......@@ -1040,15 +1040,22 @@ gtk_entry_key_press (GtkWidget *widget,
if (!entry->editable)
return FALSE;
/* Activate key bindings
*/
if (GTK_WIDGET_CLASS (parent_class)->key_press_event (widget, event))
if (gtk_im_context_filter_keypress (entry->im_context, event))
{
entry->need_im_reset = TRUE;
return TRUE;
}
else if (GTK_WIDGET_CLASS (parent_class)->key_press_event (widget, event))
/* Activate key bindings
*/
return TRUE;
else if (event->keyval == GDK_Return)
{
gtk_widget_activate (widget);
return TRUE;
}
/* Not bound, pass to input method
*/
entry->need_im_reset = TRUE;
return gtk_im_context_filter_keypress (entry->im_context, event);
return FALSE;
}
static gint
......@@ -1564,7 +1571,7 @@ gtk_entry_preedit_changed_cb (GtkIMContext *context,
&cursor_pos);
entry->preedit_length = strlen (preedit_string);
cursor_pos = CLAMP (cursor_pos, 0, g_utf8_strlen (preedit_string, -1));
cursor_pos = g_utf8_offset_to_pointer (preedit_string, cursor_pos) - preedit_string;
entry->preedit_cursor = g_utf8_offset_to_pointer (preedit_string, cursor_pos) - preedit_string;
g_free (preedit_string);
gtk_entry_recompute (entry);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment