callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Calculate the length of the entry contents in characters, not in bytes.

Browse Source 
Thu Jun  3 21:17:29 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkentry.c (gtk_entry_completion_timeout): Calculate the
	length of the entry contents in characters, not in bytes.

	* gtk/gtkentry.c (paste_received): Don't pop up the completion
	window on paste, noticed by Anders Carlsson.
This commit is contained in:
Matthias Clasen 2004-06-04 01:19:55 +00:00 committed by Matthias Clasen
parent 4d33f2c956
commit 8509d7f4ea
5 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Thu Jun 3 21:17:29 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkentry.c (gtk_entry_completion_timeout): Calculate the
length of the entry contents in characters, not in bytes.
* gtk/gtkentry.c (paste_received): Don't pop up the completion
window on paste, noticed by Anders Carlsson.
Thu Jun 3 20:56:19 2004 Matthias Clasen <maclas@gmx.de> Thu Jun 3 20:56:19 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c (gtk_combo_box_class_init): Fix the allowed * gtk/gtkcombobox.c (gtk_combo_box_class_init): Fix the allowed

8
ChangeLog.pre-2-10
View File

@ -1,3 +1,11 @@
Thu Jun 3 21:17:29 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkentry.c (gtk_entry_completion_timeout): Calculate the
length of the entry contents in characters, not in bytes.
* gtk/gtkentry.c (paste_received): Don't pop up the completion
window on paste, noticed by Anders Carlsson.
Thu Jun 3 20:56:19 2004 Matthias Clasen <maclas@gmx.de> Thu Jun 3 20:56:19 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c (gtk_combo_box_class_init): Fix the allowed * gtk/gtkcombobox.c (gtk_combo_box_class_init): Fix the allowed

8
ChangeLog.pre-2-6
View File

@ -1,3 +1,11 @@
Thu Jun 3 21:17:29 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkentry.c (gtk_entry_completion_timeout): Calculate the
length of the entry contents in characters, not in bytes.
* gtk/gtkentry.c (paste_received): Don't pop up the completion
window on paste, noticed by Anders Carlsson.
Thu Jun 3 20:56:19 2004 Matthias Clasen <maclas@gmx.de> Thu Jun 3 20:56:19 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c (gtk_combo_box_class_init): Fix the allowed * gtk/gtkcombobox.c (gtk_combo_box_class_init): Fix the allowed

8
ChangeLog.pre-2-8
View File

@ -1,3 +1,11 @@
Thu Jun 3 21:17:29 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkentry.c (gtk_entry_completion_timeout): Calculate the
length of the entry contents in characters, not in bytes.
* gtk/gtkentry.c (paste_received): Don't pop up the completion
window on paste, noticed by Anders Carlsson.
Thu Jun 3 20:56:19 2004 Matthias Clasen <maclas@gmx.de> Thu Jun 3 20:56:19 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcombobox.c (gtk_combo_box_class_init): Fix the allowed * gtk/gtkcombobox.c (gtk_combo_box_class_init): Fix the allowed

13
gtk/gtkentry.c
View File

@ -3418,6 +3418,14 @@ paste_received (GtkClipboard *clipboard,
if (text) if (text)
{ {
gint pos, start, end; gint pos, start, end;
GtkEntryCompletion *completion = gtk_entry_get_completion (entry);
if (completion)
{
g_signal_handler_block (entry, completion->priv->changed_id);
if (GTK_WIDGET_MAPPED (completion->priv->popup_window))
_gtk_entry_completion_popdown (completion);
}
if (gtk_editable_get_selection_bounds (editable, &start, &end)) if (gtk_editable_get_selection_bounds (editable, &start, &end))
gtk_editable_delete_text (editable, start, end); gtk_editable_delete_text (editable, start, end);
@ -3425,6 +3433,9 @@ paste_received (GtkClipboard *clipboard,
pos = entry->current_pos; pos = entry->current_pos;
gtk_editable_insert_text (editable, text, -1, &pos); gtk_editable_insert_text (editable, text, -1, &pos);
gtk_editable_set_position (editable, pos); gtk_editable_set_position (editable, pos);
if (completion)
g_signal_handler_unblock (entry, completion->priv->changed_id);
} }
g_object_unref (entry); g_object_unref (entry);
@ -4632,7 +4643,7 @@ gtk_entry_completion_timeout (gpointer data)
completion->priv->completion_timeout = 0; completion->priv->completion_timeout = 0;
if (strlen (gtk_entry_get_text (GTK_ENTRY (completion->priv->entry))) if (g_utf8_strlen (gtk_entry_get_text (GTK_ENTRY (completion->priv->entry)), -1)
>= completion->priv->minimum_key_length) >= completion->priv->minimum_key_length)
{ {
gint matches; gint matches;