[maemo-commits] [maemo-commits] r14454 - projects/haf/trunk/gtk+/gtk

[From: subversion at stage.maemo.org]

Author: xan
Date: 2007-10-16 14:34:33 +0300 (Tue, 16 Oct 2007)
New Revision: 14454

Modified:
   projects/haf/trunk/gtk+/gtk/gtkcontainer.c
   projects/haf/trunk/gtk+/gtk/gtkwidget.c
Log:
Only add toplevels to the size_allocated_containers list.

It seems that we only *really* want to make focused children visible after
a toplevel is resized (see NB#57886) but not after every container is resized,
as it might break the logic of some widgets (eg, ModestScrollArea). At this
point it might not make much sense to have this in GtkContainer anymore  and
maybe we should move it to GtkWindow size_allocate (Tommi's suggestion).


Modified: projects/haf/trunk/gtk+/gtk/gtkcontainer.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkcontainer.c	2007-10-16 08:25:44 UTC (rev 14453)
+++ projects/haf/trunk/gtk+/gtk/gtkcontainer.c	2007-10-16 11:34:33 UTC (rev 14454)
@@ -1359,9 +1359,7 @@
     {
       GtkWidget *last = NULL;
       GSList *current;
-      /* collect involved toplevels */
-      for (current = size_allocated_containers; current; current = current->next)
-        current->data = gtk_widget_get_toplevel (current->data);
+
       /* sort toplevels to allow deduping */
       size_allocated_containers = g_slist_sort (size_allocated_containers, g_direct_equal);
       /* adjust focus position on toplevels */

Modified: projects/haf/trunk/gtk+/gtk/gtkwidget.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkwidget.c	2007-10-16 08:25:44 UTC (rev 14453)
+++ projects/haf/trunk/gtk+/gtk/gtkwidget.c	2007-10-16 11:34:33 UTC (rev 14454)
@@ -3421,7 +3421,7 @@
     }
 
 #ifdef MAEMO_CHANGES
-  if (GTK_IS_CONTAINER (widget))
+  if (GTK_WIDGET_TOPLEVEL (widget))
     _gtk_container_post_size_allocate (GTK_CONTAINER (widget));
 #endif
 }