From c8bab6c3d5baa316f672f036871ce6d7c9369f5b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 18 Nov 2005 19:13:11 +0000 Subject: [PATCH] Turn off input methods in invisible entries, since they are confusing. 2005-11-18 Matthias Clasen Turn off input methods in invisible entries, since they are confusing. (#317002, James Su) * gtk/gtkentry.c (gtk_entry_set_visibility): Toggle input methods if visibility changes. (popup_targets_received): Don't show the input method menu if the entry is invisible. --- ChangeLog | 10 ++++++++++ ChangeLog.pre-2-10 | 10 ++++++++++ gtk/gtkentry.c | 39 +++++++++++++++++++++++++++++++++++---- 3 files changed, 55 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1002649265..e8237acee4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2005-11-18 Matthias Clasen + + Turn off input methods in invisible entries, since + they are confusing. (#317002, James Su) + + * gtk/gtkentry.c (gtk_entry_set_visibility): Toggle input + methods if visibility changes. + (popup_targets_received): Don't show the input method + menu if the entry is invisible. + 2005-11-17 Matthias Clasen * README.in: Add a note about range arrow sensitivity. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1002649265..e8237acee4 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,13 @@ +2005-11-18 Matthias Clasen + + Turn off input methods in invisible entries, since + they are confusing. (#317002, James Su) + + * gtk/gtkentry.c (gtk_entry_set_visibility): Toggle input + methods if visibility changes. + (popup_targets_received): Don't show the input method + menu if the entry is invisible. + 2005-11-17 Matthias Clasen * README.in: Add a note about range arrow sensitivity. diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index 83cc9f409c..6261143428 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -3969,9 +3969,37 @@ gtk_entry_set_visibility (GtkEntry *entry, { g_return_if_fail (GTK_IS_ENTRY (entry)); - entry->visible = visible ? TRUE : FALSE; - g_object_notify (G_OBJECT (entry), "visibility"); - gtk_entry_recompute (entry); + visible = visible != FALSE; + + if (entry->visible != visible) + { + if (GTK_WIDGET_HAS_FOCUS (entry) && !visible) + gtk_im_context_focus_out (entry->im_context); + + g_object_unref (entry->im_context); + + if (visible) + entry->im_context = gtk_im_multicontext_new (); + else + entry->im_context = gtk_im_context_simple_new (); + + g_signal_connect (entry->im_context, "commit", + G_CALLBACK (gtk_entry_commit_cb), entry); + g_signal_connect (entry->im_context, "preedit_changed", + G_CALLBACK (gtk_entry_preedit_changed_cb), entry); + g_signal_connect (entry->im_context, "retrieve_surrounding", + G_CALLBACK (gtk_entry_retrieve_surrounding_cb), entry); + g_signal_connect (entry->im_context, "delete_surrounding", + G_CALLBACK (gtk_entry_delete_surrounding_cb), entry); + + if (GTK_WIDGET_HAS_FOCUS (entry) && visible) + gtk_im_context_focus_in (entry->im_context); + + entry->visible = visible; + + g_object_notify (G_OBJECT (entry), "visibility"); + gtk_entry_recompute (entry); + } } /** @@ -4601,7 +4629,10 @@ popup_targets_received (GtkClipboard *clipboard, "gtk-show-input-method-menu", &show_input_method_menu, "gtk-show-unicode-menu", &show_unicode_menu, NULL); - + + if (!entry->visible) + show_input_method_menu = FALSE; + if (show_input_method_menu || show_unicode_menu) { menuitem = gtk_separator_menu_item_new ();