Attachment 51106 Details for Bug 117115

[patch] A new patch for gtk2.

gtkentry-invisible.diff (text/plain), 2.78 KB, created by Zhe Su on 2005-09-29 05:54:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Zhe Su

Created: 2005-09-29 05:54:31 UTC

Size: 2.78 KB

patch

obsolete

>--- gtk/gtkentry.c.old	2005-09-29 11:24:10.000000000 +0800
>+++ gtk/gtkentry.c	2005-09-29 11:27:46.000000000 +0800
>@@ -3938,7 +3938,30 @@
> {
>   g_return_if_fail (GTK_IS_ENTRY (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);
>+
>+      entry->im_context = (visible ? gtk_im_multicontext_new () : 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 ? TRUE : FALSE;
>+
>   g_object_notify (G_OBJECT (entry), "visibility");
>   gtk_entry_recompute (entry);
> }
>@@ -4562,22 +4585,23 @@
> 			        G_CALLBACK (gtk_entry_select_all), entry);
>       gtk_widget_show (menuitem);
>       gtk_menu_shell_append (GTK_MENU_SHELL (entry->popup_menu), menuitem);
>-      
>-      menuitem = gtk_separator_menu_item_new ();
>-      gtk_widget_show (menuitem);
>-      gtk_menu_shell_append (GTK_MENU_SHELL (entry->popup_menu), menuitem);
>-      
>-      menuitem = gtk_menu_item_new_with_mnemonic (_("Input _Methods"));
>-      gtk_widget_set_sensitive (menuitem, entry->editable);      
>-      gtk_widget_show (menuitem);
>-      submenu = gtk_menu_new ();
>-      gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu);
>-      
>-      gtk_menu_shell_append (GTK_MENU_SHELL (entry->popup_menu), menuitem);
>-      
>-      gtk_im_multicontext_append_menuitems (GTK_IM_MULTICONTEXT (entry->im_context),
>-					    GTK_MENU_SHELL (submenu));
>-      
>+ 
>+      if (entry->visible)
>+	{
>+	  menuitem = gtk_separator_menu_item_new ();
>+	  gtk_widget_show (menuitem);
>+	  gtk_menu_shell_append (GTK_MENU_SHELL (entry->popup_menu), menuitem);
>+
>+	  menuitem = gtk_menu_item_new_with_mnemonic (_("Input _Methods"));
>+	  gtk_widget_set_sensitive (menuitem, entry->editable);      
>+	  gtk_widget_show (menuitem);
>+	  submenu = gtk_menu_new ();
>+	  gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), submenu);
>+	  gtk_menu_shell_append (GTK_MENU_SHELL (entry->popup_menu), menuitem);
>+	  gtk_im_multicontext_append_menuitems (GTK_IM_MULTICONTEXT (entry->im_context),
>+						GTK_MENU_SHELL (submenu));
>+	}
>+
>       menuitem = gtk_menu_item_new_with_mnemonic (_("_Insert Unicode Control Character"));
>       gtk_widget_show (menuitem);
>

Actions: View | Diff

Attachments on bug 117115: 50156 | 50175 | 50420 | 50547 | 50636 | 51106