[maemo-commits] [maemo-commits] r17234 - in projects/haf/trunk/gtk+: . gtk

[From: subversion at stage.maemo.org]

Author: kris
Date: 2009-01-19 17:09:27 +0200 (Mon, 19 Jan 2009)
New Revision: 17234

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtktextview.c
Log:
2009-01-19  Kristian Rietveld  <kris at imendio.com>

	Fixes: NB#93161 - GTKTextView scrolls to cursor on size change
	even if text view non-editable.

	* gtk/gtktextview.c (gtk_text_view_size_allocate): only scroll
	to cursor if the cursor is visible.



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2009-01-19 11:01:42 UTC (rev 17233)
+++ projects/haf/trunk/gtk+/ChangeLog	2009-01-19 15:09:27 UTC (rev 17234)
@@ -1,5 +1,13 @@
 2009-01-19  Kristian Rietveld  <kris at imendio.com>
 
+	Fixes: NB#93161 - GTKTextView scrolls to cursor on size change
+	even if text view non-editable.
+
+	* gtk/gtktextview.c (gtk_text_view_size_allocate): only scroll
+	to cursor if the cursor is visible.
+
+2009-01-19  Kristian Rietveld  <kris at imendio.com>
+
 	Fixes: NB#98272 - GtkTreeSelection: Conditional jump or move
 	depends on uninitialised value(s)
 

Modified: projects/haf/trunk/gtk+/gtk/gtktextview.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtktextview.c	2009-01-19 11:01:42 UTC (rev 17233)
+++ projects/haf/trunk/gtk+/gtk/gtktextview.c	2009-01-19 15:09:27 UTC (rev 17234)
@@ -3420,11 +3420,14 @@
       gdk_window_invalidate_rect (widget->window, NULL, FALSE);
 
 #ifdef MAEMO_CHANGES
-      /* keep cursor visible (when IM opens, for instance) */
-      gtk_text_view_scroll_to_mark (text_view,
-                                    gtk_text_buffer_get_mark (get_buffer (text_view),
-                                                              "insert"),
-                                    0.0, FALSE, 0.0, 0.0);
+      /* Keep cursor visible (when IM opens, for instance), but
+       * only if the cursor is not hidden.
+       */
+      if (text_view->cursor_visible)
+        gtk_text_view_scroll_to_mark (text_view,
+                                      gtk_text_buffer_get_mark (get_buffer (text_view),
+                                                                "insert"),
+                                      0.0, FALSE, 0.0, 0.0);
 #endif /* MAEMO_CHANGES */
     }
 }