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

[From: subversion at stage.maemo.org]

Author: herzi
Date: 2009-05-05 11:50:49 +0300 (Tue, 05 May 2009)
New Revision: 18233

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkcontainer.c
Log:
2009-05-05  Sven Herzberg  <herzi at lanedo.com>

	Addresses: NB#98705 - When forwarding a mail with multiple attachments
	a new editor opens with To field overlapped

	* gtk/gtkcontainer.c (container_scroll_focus_adjustments): make sure
	we only clamp the adjustments when the values we got are actually
	valid


Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2009-05-04 15:33:12 UTC (rev 18232)
+++ projects/haf/trunk/gtk+/ChangeLog	2009-05-05 08:50:49 UTC (rev 18233)
@@ -1,3 +1,12 @@
+2009-05-05  Sven Herzberg  <herzi at lanedo.com>
+
+	Addresses: NB#98705 - When forwarding a mail with multiple attachments
+	a new editor opens with To field overlapped
+
+	* gtk/gtkcontainer.c (container_scroll_focus_adjustments): make sure
+	we only clamp the adjustments when the values we got are actually
+	valid
+
 2009-04-30  Michael Natterer  <mitch at imendio.com>
 
 	Fixes the GTK+ part of: NB#103219 - Could not select Block speed

Modified: projects/haf/trunk/gtk+/gtk/gtkcontainer.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkcontainer.c	2009-05-04 15:33:12 UTC (rev 18232)
+++ projects/haf/trunk/gtk+/gtk/gtkcontainer.c	2009-05-05 08:50:49 UTC (rev 18233)
@@ -1767,6 +1767,9 @@
       vadj = g_object_get_qdata (G_OBJECT (container), vadjustment_key_id);
       if (hadj || vadj) 
 	{
+#ifdef MAEMO_CHANGES
+          gboolean valid_coordinates = FALSE;
+#endif
 
 	  focus_child = container->focus_child;
 	  while (GTK_IS_CONTAINER (focus_child) && 
@@ -1775,6 +1778,9 @@
 	      focus_child = GTK_CONTAINER (focus_child)->focus_child;
 	    }
 	  
+#ifdef MAEMO_CHANGES
+          valid_coordinates =
+#endif
 	  gtk_widget_translate_coordinates (focus_child, container->focus_child, 
 					    0, 0, &x, &y);
 
@@ -1790,7 +1796,7 @@
 	       * to oscillate between two values (possibly HildonScrollArea is
 	       * causing that.) That should be enough for vkb resized dialogs.
 	       */
-	      if (!resize_update || focus_child->allocation.height < vadj->page_size)
+	      if (valid_coordinates && !resize_update || focus_child->allocation.height < vadj->page_size)
 #endif /* MAEMO_CHANGES */
 		gtk_adjustment_clamp_page (vadj, y, y + focus_child->allocation.height);
 	    }
@@ -1798,7 +1804,7 @@
 	  if (hadj)
 	    {
 #ifdef MAEMO_CHANGES
-	      if (!resize_update || focus_child->allocation.width < hadj->page_size)
+	      if (valid_coordinates && !resize_update || focus_child->allocation.width < hadj->page_size)
 #endif /* MAEMO_CHANGES */
 		gtk_adjustment_clamp_page (hadj, x, x + focus_child->allocation.width);
 	    }