scrolledwindow test: Check natural width for max content size

The maximum content size does not increase the minimum request
but only ensures that both minimum and natural requests do not
exceed the maximum setting.
This commit is contained in:
Tristan Van Berkom 2016-06-07 14:02:37 +09:00
parent 34feba1e7c
commit d6187c9a02

View File

@ -46,11 +46,11 @@ test_size (GtkOrientation orientation,
* Here, the content is purposely bigger than the scrolled window,
* so it should grow up to max-content-width.
*/
gtk_widget_get_preferred_width (scrolledwindow, &size, NULL);
gtk_widget_get_preferred_width (scrolledwindow, NULL, &size);
gtk_widget_get_preferred_width (box, &child_size, NULL);
g_assert_cmpint (child_size, ==, BOX_SIZE);
g_assert_cmpint (size, >=, MAX_SIZE);
g_assert_cmpint (size, ==, MAX_SIZE);
}
}
/* Testing the content-height property */
@ -74,11 +74,11 @@ test_size (GtkOrientation orientation,
* Here, the content is purposely bigger than the scrolled window,
* so it should grow up to max-content-height.
*/
gtk_widget_get_preferred_height (scrolledwindow, &size, NULL);
gtk_widget_get_preferred_height (scrolledwindow, NULL, &size);
gtk_widget_get_preferred_height (box, &child_size, NULL);
g_assert_cmpint (child_size, ==, BOX_SIZE);
g_assert_cmpint (size, >=, MAX_SIZE);
g_assert_cmpint (size, ==, MAX_SIZE);
}
}
}