AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Turn off input methods in invisible entries, since they are confusing.

Browse Source 
2005-11-18  Matthias Clasen  <mclasen@redhat.com>

	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.
This commit is contained in:
Matthias Clasen 2005-11-18 19:13:11 +00:00 committed by Matthias Clasen
parent 9c124b1ab2
commit c8bab6c3d5
3 changed files with 55 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2005-11-18 Matthias Clasen <mclasen@redhat.com>
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 <mclasen@redhat.com> 2005-11-17 Matthias Clasen <mclasen@redhat.com>
* README.in: Add a note about range arrow sensitivity. * README.in: Add a note about range arrow sensitivity.

10
ChangeLog.pre-2-10
View File

@ -1,3 +1,13 @@
2005-11-18 Matthias Clasen <mclasen@redhat.com>
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 <mclasen@redhat.com> 2005-11-17 Matthias Clasen <mclasen@redhat.com>
* README.in: Add a note about range arrow sensitivity. * README.in: Add a note about range arrow sensitivity.

39
gtk/gtkentry.c
View File

@ -3969,9 +3969,37 @@ gtk_entry_set_visibility (GtkEntry *entry,
{ {
g_return_if_fail (GTK_IS_ENTRY (entry)); g_return_if_fail (GTK_IS_ENTRY (entry));
entry->visible = visible ? TRUE : FALSE; visible = visible != FALSE;
g_object_notify (G_OBJECT (entry), "visibility");
gtk_entry_recompute (entry); 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-input-method-menu", &show_input_method_menu,
"gtk-show-unicode-menu", &show_unicode_menu, "gtk-show-unicode-menu", &show_unicode_menu,
NULL); NULL);
if (!entry->visible)
show_input_method_menu = FALSE;
if (show_input_method_menu || show_unicode_menu) if (show_input_method_menu || show_unicode_menu)
{ {
menuitem = gtk_separator_menu_item_new (); menuitem = gtk_separator_menu_item_new ();