Attachment 50547 Details for Bug 117115

[patch] It should be the final patch for gtk2.

gtkentry-invisible.diff (text/plain), 6.01 KB, created by Zhe Su on 2005-09-21 15:57:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Zhe Su

Created: 2005-09-21 15:57:32 UTC

Size: 6.01 KB

patch

obsolete

>--- gtk/gtkentry.c.old	2005-09-21 11:25:28.000000000 +0800
>+++ gtk/gtkentry.c	2005-09-21 23:46:22.000000000 +0800
>@@ -876,7 +876,7 @@
> 	    if (!new_value)
> 	      {
> 		gtk_entry_reset_im_context (entry);
>-		if (GTK_WIDGET_HAS_FOCUS (entry))
>+		if (GTK_WIDGET_HAS_FOCUS (entry) && entry->visible)
> 		  gtk_im_context_focus_out (entry->im_context);
> 
> 		entry->preedit_length = 0;
>@@ -885,7 +885,7 @@
> 
> 	    entry->editable = new_value;
> 
>-	    if (new_value && GTK_WIDGET_HAS_FOCUS (entry))
>+	    if (new_value && GTK_WIDGET_HAS_FOCUS (entry) && entry->visible)
> 	      gtk_im_context_focus_in (entry->im_context);
> 	    
> 	    gtk_entry_queue_draw (entry);
>@@ -1849,7 +1849,7 @@
> 
>   gtk_entry_pend_cursor_blink (entry);
> 
>-  if (entry->editable)
>+  if (entry->editable && entry->visible)
>     {
>       if (gtk_im_context_filter_keypress (entry->im_context, event))
> 	{
>@@ -1876,6 +1876,26 @@
>      */
>     return TRUE;
> 
>+  /* Commit key event directly if visible is set to FALSE.
>+   */
>+  if (entry->editable && !entry->visible)
>+    {
>+      gunichar ch;
>+      ch = gdk_keyval_to_unicode (event->keyval);
>+
>+      if (g_unichar_validate (ch))
>+	{
>+	  gchar buf[10];
>+	  gint len;
>+	  len = g_unichar_to_utf8 (ch, buf);
>+	  buf[len] = '\0';
>+
>+	  gtk_entry_enter_text (entry, buf);
>+
>+	  return TRUE;
>+	}
>+    }
>+
>   return FALSE;
> }
> 
>@@ -1885,7 +1905,7 @@
> {
>   GtkEntry *entry = GTK_ENTRY (widget);
> 
>-  if (entry->editable)
>+  if (entry->editable && entry->visible)
>     {
>       if (gtk_im_context_filter_keypress (entry->im_context, event))
> 	{
>@@ -1905,7 +1925,7 @@
>   
>   gtk_widget_queue_draw (widget);
>   
>-  if (entry->editable)
>+  if (entry->editable && entry->visible)
>     {
>       entry->need_im_reset = TRUE;
>       gtk_im_context_focus_in (entry->im_context);
>@@ -1929,7 +1949,7 @@
>   
>   gtk_widget_queue_draw (widget);
> 
>-  if (entry->editable)
>+  if (entry->editable && entry->visible)
>     {
>       entry->need_im_reset = TRUE;
>       gtk_im_context_focus_out (entry->im_context);
>@@ -2727,7 +2747,7 @@
> 		     const gchar  *str,
> 		     GtkEntry     *entry)
> {
>-  if (entry->editable)
>+  if (entry->editable && entry->visible)
>     gtk_entry_enter_text (entry, str);
> }
> 
>@@ -2735,7 +2755,7 @@
> gtk_entry_preedit_changed_cb (GtkIMContext *context,
> 			      GtkEntry     *entry)
> {
>-  if (entry->editable)
>+  if (entry->editable && entry->visible)
>     {
>       gchar *preedit_string;
>       gint cursor_pos;
>@@ -2756,12 +2776,16 @@
> gtk_entry_retrieve_surrounding_cb (GtkIMContext *context,
> 			       GtkEntry     *entry)
> {
>-  gtk_im_context_set_surrounding (context,
>-				  entry->text,
>-				  entry->n_bytes,
>-				  g_utf8_offset_to_pointer (entry->text, entry->current_pos) - entry->text);
>+  if (entry->visible)
>+    {
>+      gtk_im_context_set_surrounding (context,
>+				      entry->text,
>+				      entry->n_bytes,
>+				      g_utf8_offset_to_pointer (entry->text, entry->current_pos) - entry->text);
>+      return TRUE;
>+    }
> 
>-  return TRUE;
>+  return FALSE;
> }
> 
> static gboolean
>@@ -2770,12 +2794,16 @@
> 				 gint          n_chars,
> 				 GtkEntry     *entry)
> {
>-  if (entry->editable)
>-    gtk_editable_delete_text (GTK_EDITABLE (entry),
>-                              entry->current_pos + offset,
>-                              entry->current_pos + offset + n_chars);
>+  if (entry->editable && entry->visible)
>+    {
>+      gtk_editable_delete_text (GTK_EDITABLE (entry),
>+                                entry->current_pos + offset,
>+                                entry->current_pos + offset + n_chars);
> 
>-  return TRUE;
>+      return TRUE;
>+    }
>+
>+  return FALSE;
> }
> 
> /* Internal functions
>@@ -2851,30 +2879,32 @@
> static void
> update_im_cursor_location (GtkEntry *entry)
> {
>-  GdkRectangle area;
>-  gint strong_x;
>-  gint strong_xoffset;
>-  gint area_width, area_height;
>+  if (entry->visible)
>+    {
>+      GdkRectangle area;
>+      gint strong_x;
>+      gint strong_xoffset;
>+      gint area_width, area_height;
> 
>-  gtk_entry_get_cursor_locations (entry, CURSOR_STANDARD, &strong_x, NULL)
>-;
>-  get_text_area_size (entry, NULL, NULL, &area_width, &area_height);
>+      gtk_entry_get_cursor_locations (entry, CURSOR_STANDARD, &strong_x, NULL);
>+      get_text_area_size (entry, NULL, NULL, &area_width, &area_height);
> 
>-  strong_xoffset = strong_x - entry->scroll_offset;
>-  if (strong_xoffset < 0)
>-    {
>-      strong_xoffset = 0;
>-    }
>-  else if (strong_xoffset > area_width)
>-    {
>-      strong_xoffset = area_width;
>-    }
>-  area.x = strong_xoffset;
>-  area.y = 0;
>-  area.width = 0;
>-  area.height = area_height;
>+      strong_xoffset = strong_x - entry->scroll_offset;
>+      if (strong_xoffset < 0)
>+	{
>+	  strong_xoffset = 0;
>+	}
>+      else if (strong_xoffset > area_width)
>+	{
>+	  strong_xoffset = area_width;
>+	}
>+      area.x = strong_xoffset;
>+      area.y = 0;
>+      area.width = 0;
>+      area.height = area_height;
> 
>-  gtk_im_context_set_cursor_location (entry->im_context, &area);
>+      gtk_im_context_set_cursor_location (entry->im_context, &area);
>+    }
> }
> 
> static gboolean
>@@ -2947,7 +2977,7 @@
> 
>   pango_layout_set_single_paragraph_mode (layout, TRUE);
>   
>-  if (include_preedit)
>+  if (include_preedit && entry->visible)
>     {
>       gtk_im_context_get_preedit_string (entry->im_context,
> 					 &preedit_string, &preedit_attrs, NULL);
>@@ -3295,7 +3325,7 @@
> static void
> gtk_entry_reset_im_context (GtkEntry *entry)
> {
>-  if (entry->need_im_reset)
>+  if (entry->need_im_reset && entry->visible)
>     {
>       entry->need_im_reset = 0;
>       gtk_im_context_reset (entry->im_context);
>@@ -3936,10 +3966,23 @@
> gtk_entry_set_visibility (GtkEntry *entry,
> 			  gboolean visible)
> {
>+  gboolean old_visible;
>+
>   g_return_if_fail (GTK_IS_ENTRY (entry));
> 
>+  old_visible = entry->visible;
>+
>   entry->visible = visible ? TRUE : FALSE;
>   g_object_notify (G_OBJECT (entry), "visibility");
>+
>+  if (GTK_WIDGET_HAS_FOCUS (entry))
>+    {
>+      if (entry->visible && !old_visible)
>+	gtk_im_context_focus_in (entry->im_context);
>+      else if (!entry->visible && old_visible)
>+	gtk_im_context_focus_out (entry->im_context);
>+    }
>+
>   gtk_entry_recompute (entry);
> }
>

Actions: View | Diff

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