]> Pileus Git - ~andy/gtk/commitdiff
Removed checks in gtksizerequest.c
authorTristan Van Berkom <tristan.van.berkom@gmail.com>
Wed, 29 Dec 2010 07:12:11 +0000 (16:12 +0900)
committerTristan Van Berkom <tristan.van.berkom@gmail.com>
Wed, 29 Dec 2010 07:12:11 +0000 (16:12 +0900)
Checks were in place to ensure that widgets never request taller
or wider than screen size. This was there to test a theory about
scrolled window children functioning correctly with dynamic content
however it breaks GtkViewport children which can generally return a
value taller than screen height intentionally, GtkViewport uses this
value to update the adjustments.

gtk/gtksizerequest.c

index 41ec2599f4435c05970d9afe631598ef6ae5fdaf..c5e49e7db3fa4afa76dc91d4a1bd45eea2ce4822 100644 (file)
@@ -239,14 +239,6 @@ compute_size_for_orientation (GtkWidget         *widget,
                                                                             &min_size, &nat_size);
              pop_recursion_check (widget, orientation);
             }
-#ifndef G_DISABLE_CHECKS
-          if (gtk_widget_get_screen (widget))
-            {
-              guint screen_width = gdk_screen_get_width (gtk_widget_get_screen (widget));
-              min_size = MIN (min_size, screen_width);
-              nat_size = MIN (nat_size, screen_width);
-            }
-#endif
         }
       else
         {
@@ -280,14 +272,6 @@ compute_size_for_orientation (GtkWidget         *widget,
                                                                             &min_size, &nat_size);
              pop_recursion_check (widget, orientation);
             }
-#ifndef G_DISABLE_CHECKS
-          if (gtk_widget_get_screen (widget))
-            {
-              guint screen_height = gdk_screen_get_height (gtk_widget_get_screen (widget));
-              min_size = MIN (min_size, screen_height);
-              nat_size = MIN (nat_size, screen_height);
-            }
-#endif
         }
 
       if (min_size > nat_size)