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

[From: subversion at stage.maemo.org]

Author: kris
Date: 2009-09-07 10:10:17 +0300 (Mon, 07 Sep 2009)
New Revision: 19295

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtktextview.c
Log:
2009-09-07  Kristian Rietveld  <kris at lanedo.com>

	Fixes: NB#134994 - placeholder text is cut when panned slowly

	* gtk/gtktextview.c (gtk_text_view_style_set): immediately re-validate
	the placeholder layout,
	(gtk_text_view_ensure_placeholder_layout): increase the max pixels to
	validate to 2000 (that is also used for incremental validations in
	timeouts).



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2009-09-04 15:51:38 UTC (rev 19294)
+++ projects/haf/trunk/gtk+/ChangeLog	2009-09-07 07:10:17 UTC (rev 19295)
@@ -1,3 +1,13 @@
+2009-09-07  Kristian Rietveld  <kris at lanedo.com>
+
+	Fixes: NB#134994 - placeholder text is cut when panned slowly
+
+	* gtk/gtktextview.c (gtk_text_view_style_set): immediately re-validate
+	the placeholder layout,
+	(gtk_text_view_ensure_placeholder_layout): increase the max pixels to
+	validate to 2000 (that is also used for incremental validations in
+	timeouts).
+
 2009-08-24  Claudio Saavedra  <csaavedra at igalia.com>
 
 	Release 2:2.14.7-1maemo9

Modified: projects/haf/trunk/gtk+/gtk/gtktextview.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtktextview.c	2009-09-04 15:51:38 UTC (rev 19294)
+++ projects/haf/trunk/gtk+/gtk/gtktextview.c	2009-09-07 07:10:17 UTC (rev 19295)
@@ -4082,6 +4082,11 @@
 
       g_object_unref (ltr_context);
       g_object_unref (rtl_context);
+
+      /* The call to gtk_text_layout_set_contexts() invalidates the entire
+       * layout, so re-validate the placeholder layout immediately.
+       */
+      gtk_text_layout_validate (priv->placeholder_layout, 2000);
     }
 #endif /* MAEMO_CHANGES */
 }
@@ -9576,7 +9581,7 @@
   /* Now make sure the layout is validated.  Since we expect the
    * placeholder to only be a single line, this should be quick.
    */
-  gtk_text_layout_validate (priv->placeholder_layout, 100);
+  gtk_text_layout_validate (priv->placeholder_layout, 2000);
 }
 
 /**