AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "testsuite/scrolledwindow—Test non-overlay/non-auto"

Browse Source 
This reverts commit 5a6e6689ec.

Reverting until I can be sure gtkscrolledwindow.c does the right thing.

https://bugzilla.gnome.org/show_bug.cgi?id=778853
This commit is contained in:
Daniel Boles 2017-02-22 19:26:14 +00:00
parent 10e49a2861
commit 449a17b56d
1 changed files with 40 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

234
testsuite/gtk/scrolledwindow.c
View File

@ -1,8 +1,8 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#define EXPECTED_MIN_SIZE 150 #define MIN_SIZE 150
#define EXPECTED_MAX_SIZE 300 #define MAX_SIZE 300
#define EXPECTED_BOX_SIZE 600 #define BOX_SIZE 600
typedef enum typedef enum
{ {
@ -12,13 +12,10 @@ typedef enum
static void static void
test_size (GtkOrientation orientation, test_size (GtkOrientation orientation,
gboolean overlay,
GtkPolicyType policy,
TestProperty prop) TestProperty prop)
{ {
GtkWidget *scrolledwindow, *box; GtkWidget *scrolledwindow, *box;
int min_size, max_size, child_size; int size, child_size;
int scrollbar_size = 0;
box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_set_hexpand (box, TRUE); gtk_widget_set_hexpand (box, TRUE);
@ -27,8 +24,6 @@ test_size (GtkOrientation orientation,
scrolledwindow = gtk_scrolled_window_new (NULL, NULL); scrolledwindow = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_propagate_natural_width (GTK_SCROLLED_WINDOW (scrolledwindow), TRUE); gtk_scrolled_window_set_propagate_natural_width (GTK_SCROLLED_WINDOW (scrolledwindow), TRUE);
gtk_scrolled_window_set_propagate_natural_height (GTK_SCROLLED_WINDOW (scrolledwindow), TRUE); gtk_scrolled_window_set_propagate_natural_height (GTK_SCROLLED_WINDOW (scrolledwindow), TRUE);
gtk_scrolled_window_set_overlay_scrolling (GTK_SCROLLED_WINDOW (scrolledwindow), overlay);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow), policy, policy);
gtk_container_add (GTK_CONTAINER (scrolledwindow), box); gtk_container_add (GTK_CONTAINER (scrolledwindow), box);
/* Testing the content-width property */ /* Testing the content-width property */
@ -36,31 +31,27 @@ test_size (GtkOrientation orientation,
{ {
if (prop & MINIMUM_CONTENT) if (prop & MINIMUM_CONTENT)
{ {
gtk_scrolled_window_set_min_content_width (GTK_SCROLLED_WINDOW (scrolledwindow), EXPECTED_MIN_SIZE); gtk_scrolled_window_set_min_content_width (GTK_SCROLLED_WINDOW (scrolledwindow), MIN_SIZE);
gtk_widget_get_preferred_width (scrolledwindow, &min_size, NULL); gtk_widget_get_preferred_width (scrolledwindow, &size, NULL);
g_assert_cmpint (size, ==, MIN_SIZE);
} }
if (prop & MAXIMUM_CONTENT) if (prop & MAXIMUM_CONTENT)
{ {
gtk_scrolled_window_set_max_content_width (GTK_SCROLLED_WINDOW (scrolledwindow), EXPECTED_MAX_SIZE); gtk_scrolled_window_set_max_content_width (GTK_SCROLLED_WINDOW (scrolledwindow), MAX_SIZE);
gtk_widget_set_size_request (box, EXPECTED_BOX_SIZE, -1); gtk_widget_set_size_request (box, BOX_SIZE, -1);
/* /*
* Here, the content is purposely bigger than the scrolled window, * Here, the content is purposely bigger than the scrolled window,
* so it should grow up to max-content-width. * so it should grow up to max-content-width.
*/ */
gtk_widget_get_preferred_width (scrolledwindow, NULL, &max_size); gtk_widget_get_preferred_width (scrolledwindow, NULL, &size);
gtk_widget_get_preferred_width (box, &child_size, NULL); gtk_widget_get_preferred_width (box, &child_size, NULL);
}
/* If the relevant scrollbar is non-overlay and always shown, it is added g_assert_cmpint (child_size, ==, BOX_SIZE);
* to the preferred size. When comparing to the expected size, we need to g_assert_cmpint (size, ==, MAX_SIZE);
* to exclude that extra, as we are only interested in the content size */
if (!overlay && policy == GTK_POLICY_ALWAYS)
{
GtkWidget *scrollbar = gtk_scrolled_window_get_vscrollbar (GTK_SCROLLED_WINDOW (scrolledwindow));
gtk_widget_get_preferred_width (scrollbar, &scrollbar_size, NULL);
} }
} }
/* Testing the content-height property */ /* Testing the content-height property */
@ -68,227 +59,82 @@ test_size (GtkOrientation orientation,
{ {
if (prop & MINIMUM_CONTENT) if (prop & MINIMUM_CONTENT)
{ {
gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (scrolledwindow), EXPECTED_MIN_SIZE); gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (scrolledwindow), MIN_SIZE);
gtk_widget_get_preferred_height (scrolledwindow, &min_size, NULL); gtk_widget_get_preferred_height (scrolledwindow, &size, NULL);
g_assert_cmpint (size, ==, MIN_SIZE);
} }
if (prop & MAXIMUM_CONTENT) if (prop & MAXIMUM_CONTENT)
{ {
gtk_scrolled_window_set_max_content_height (GTK_SCROLLED_WINDOW (scrolledwindow), EXPECTED_MAX_SIZE); gtk_scrolled_window_set_max_content_height (GTK_SCROLLED_WINDOW (scrolledwindow), MAX_SIZE);
gtk_widget_set_size_request (box, -1, EXPECTED_BOX_SIZE); gtk_widget_set_size_request (box, -1, BOX_SIZE);
/* /*
* Here, the content is purposely bigger than the scrolled window, * Here, the content is purposely bigger than the scrolled window,
* so it should grow up to max-content-height. * so it should grow up to max-content-height.
*/ */
gtk_widget_get_preferred_height (scrolledwindow, NULL, &max_size); gtk_widget_get_preferred_height (scrolledwindow, NULL, &size);
gtk_widget_get_preferred_height (box, &child_size, NULL); gtk_widget_get_preferred_height (box, &child_size, NULL);
}
if (!overlay && policy == GTK_POLICY_ALWAYS) g_assert_cmpint (child_size, ==, BOX_SIZE);
{ g_assert_cmpint (size, ==, MAX_SIZE);
GtkWidget *scrollbar = gtk_scrolled_window_get_hscrollbar (GTK_SCROLLED_WINDOW (scrolledwindow));
gtk_widget_get_preferred_height (scrollbar, &scrollbar_size, NULL);
} }
} }
/* Account for the scrollbar, if it was included in the preferred size */
min_size -= scrollbar_size;
max_size -= scrollbar_size;
if (prop & MINIMUM_CONTENT)
g_assert_cmpint (min_size, ==, EXPECTED_MIN_SIZE);
if (prop & MAXIMUM_CONTENT)
{
g_assert_cmpint (child_size, ==, EXPECTED_BOX_SIZE);
g_assert_cmpint (max_size, ==, EXPECTED_MAX_SIZE);
}
} }
static void static void
min_content_width_overlay_automatic (void) min_content_width (void)
{ {
test_size (GTK_ORIENTATION_HORIZONTAL, TRUE, GTK_POLICY_AUTOMATIC, MINIMUM_CONTENT); test_size (GTK_ORIENTATION_HORIZONTAL, MINIMUM_CONTENT);
} }
static void static void
min_content_height_overlay_automatic (void) min_content_height (void)
{ {
test_size (GTK_ORIENTATION_VERTICAL, TRUE, GTK_POLICY_AUTOMATIC, MINIMUM_CONTENT); test_size (GTK_ORIENTATION_VERTICAL, MINIMUM_CONTENT);
} }
static void static void
max_content_width_overlay_automatic (void) max_content_width (void)
{ {
test_size (GTK_ORIENTATION_HORIZONTAL, TRUE, GTK_POLICY_AUTOMATIC, MAXIMUM_CONTENT); test_size (GTK_ORIENTATION_HORIZONTAL, MAXIMUM_CONTENT);
} }
static void static void
max_content_height_overlay_automatic (void) max_content_height (void)
{ {
test_size (GTK_ORIENTATION_VERTICAL, TRUE, GTK_POLICY_AUTOMATIC, MAXIMUM_CONTENT); test_size (GTK_ORIENTATION_VERTICAL, MAXIMUM_CONTENT);
} }
static void static void
min_max_content_width_overlay_automatic (void) min_max_content_width (void)
{ {
test_size (GTK_ORIENTATION_HORIZONTAL, TRUE, GTK_POLICY_AUTOMATIC, MINIMUM_CONTENT | MAXIMUM_CONTENT); test_size (GTK_ORIENTATION_HORIZONTAL, MINIMUM_CONTENT | MAXIMUM_CONTENT);
} }
static void static void
min_max_content_height_overlay_automatic (void) min_max_content_height (void)
{ {
test_size (GTK_ORIENTATION_VERTICAL, TRUE, GTK_POLICY_AUTOMATIC, MINIMUM_CONTENT | MAXIMUM_CONTENT); test_size (GTK_ORIENTATION_VERTICAL, MINIMUM_CONTENT | MAXIMUM_CONTENT);
} }
static void
min_content_width_fixed_automatic (void)
{
test_size (GTK_ORIENTATION_HORIZONTAL, FALSE, GTK_POLICY_AUTOMATIC, MINIMUM_CONTENT);
}
static void
min_content_height_fixed_automatic (void)
{
test_size (GTK_ORIENTATION_VERTICAL, FALSE, GTK_POLICY_AUTOMATIC, MINIMUM_CONTENT);
}
static void
max_content_width_fixed_automatic (void)
{
test_size (GTK_ORIENTATION_HORIZONTAL, FALSE, GTK_POLICY_AUTOMATIC, MAXIMUM_CONTENT);
}
static void
max_content_height_fixed_automatic (void)
{
test_size (GTK_ORIENTATION_VERTICAL, FALSE, GTK_POLICY_AUTOMATIC, MAXIMUM_CONTENT);
}
static void
min_max_content_width_fixed_automatic (void)
{
test_size (GTK_ORIENTATION_HORIZONTAL, FALSE, GTK_POLICY_AUTOMATIC, MINIMUM_CONTENT | MAXIMUM_CONTENT);
}
static void
min_max_content_height_fixed_automatic (void)
{
test_size (GTK_ORIENTATION_VERTICAL, FALSE, GTK_POLICY_AUTOMATIC, MINIMUM_CONTENT | MAXIMUM_CONTENT);
}
static void
min_content_width_overlay_always (void)
{
test_size (GTK_ORIENTATION_HORIZONTAL, TRUE, GTK_POLICY_ALWAYS, MINIMUM_CONTENT);
}
static void
min_content_height_overlay_always (void)
{
test_size (GTK_ORIENTATION_VERTICAL, TRUE, GTK_POLICY_ALWAYS, MINIMUM_CONTENT);
}
static void
max_content_width_overlay_always (void)
{
test_size (GTK_ORIENTATION_HORIZONTAL, TRUE, GTK_POLICY_ALWAYS, MAXIMUM_CONTENT);
}
static void
max_content_height_overlay_always (void)
{
test_size (GTK_ORIENTATION_VERTICAL, TRUE, GTK_POLICY_ALWAYS, MAXIMUM_CONTENT);
}
static void
min_max_content_width_overlay_always (void)
{
test_size (GTK_ORIENTATION_HORIZONTAL, TRUE, GTK_POLICY_ALWAYS, MINIMUM_CONTENT | MAXIMUM_CONTENT);
}
static void
min_max_content_height_overlay_always (void)
{
test_size (GTK_ORIENTATION_VERTICAL, TRUE, GTK_POLICY_ALWAYS, MINIMUM_CONTENT | MAXIMUM_CONTENT);
}
static void
min_content_width_fixed_always (void)
{
test_size (GTK_ORIENTATION_HORIZONTAL, FALSE, GTK_POLICY_ALWAYS, MINIMUM_CONTENT);
}
static void
min_content_height_fixed_always (void)
{
test_size (GTK_ORIENTATION_VERTICAL, FALSE, GTK_POLICY_ALWAYS, MINIMUM_CONTENT);
}
static void
max_content_width_fixed_always (void)
{
test_size (GTK_ORIENTATION_HORIZONTAL, FALSE, GTK_POLICY_ALWAYS, MAXIMUM_CONTENT);
}
static void
max_content_height_fixed_always (void)
{
test_size (GTK_ORIENTATION_VERTICAL, FALSE, GTK_POLICY_ALWAYS, MAXIMUM_CONTENT);
}
static void
min_max_content_width_fixed_always (void)
{
test_size (GTK_ORIENTATION_HORIZONTAL, FALSE, GTK_POLICY_ALWAYS, MINIMUM_CONTENT | MAXIMUM_CONTENT);
}
static void
min_max_content_height_fixed_always (void)
{
test_size (GTK_ORIENTATION_VERTICAL, FALSE, GTK_POLICY_ALWAYS, MINIMUM_CONTENT | MAXIMUM_CONTENT);
}
int int
main (int argc, char **argv) main (int argc, char **argv)
{ {
gtk_init (); gtk_init ();
g_test_init (&argc, &argv, NULL); g_test_init (&argc, &argv, NULL);
g_test_add_func ("/sizing/scrolledwindow/min_content_width_overlay_automatic", min_content_width_overlay_automatic); g_test_add_func ("/sizing/scrolledwindow/min_content_width", min_content_width);
g_test_add_func ("/sizing/scrolledwindow/min_content_height_overlay_automatic", min_content_height_overlay_automatic); g_test_add_func ("/sizing/scrolledwindow/min_content_height", min_content_height);
g_test_add_func ("/sizing/scrolledwindow/max_content_width_overlay_automatic", max_content_width_overlay_automatic);
g_test_add_func ("/sizing/scrolledwindow/max_content_height_overlay_automatic", max_content_height_overlay_automatic);
g_test_add_func ("/sizing/scrolledwindow/min_max_content_width_overlay_automatic", min_max_content_width_overlay_automatic);
g_test_add_func ("/sizing/scrolledwindow/min_max_content_height_overlay_automatic", min_max_content_height_overlay_automatic);
g_test_add_func ("/sizing/scrolledwindow/min_content_width_fixed_automatic", min_content_width_fixed_automatic); g_test_add_func ("/sizing/scrolledwindow/max_content_width", max_content_width);
g_test_add_func ("/sizing/scrolledwindow/min_content_height_fixed_automatic", min_content_height_fixed_automatic); g_test_add_func ("/sizing/scrolledwindow/max_content_height", max_content_height);
g_test_add_func ("/sizing/scrolledwindow/max_content_width_fixed_automatic", max_content_width_fixed_automatic);
g_test_add_func ("/sizing/scrolledwindow/max_content_height_fixed_automatic", max_content_height_fixed_automatic);
g_test_add_func ("/sizing/scrolledwindow/min_max_content_width_fixed_automatic", min_max_content_width_fixed_automatic);
g_test_add_func ("/sizing/scrolledwindow/min_max_content_height_fixed_automatic", min_max_content_height_fixed_automatic);
g_test_add_func ("/sizing/scrolledwindow/min_content_width_overlay_always", min_content_width_overlay_always); g_test_add_func ("/sizing/scrolledwindow/min_max_content_width", min_max_content_width);
g_test_add_func ("/sizing/scrolledwindow/min_content_height_overlay_always", min_content_height_overlay_always); g_test_add_func ("/sizing/scrolledwindow/min_max_content_height", min_max_content_height);
g_test_add_func ("/sizing/scrolledwindow/max_content_width_overlay_always", max_content_width_overlay_always);
g_test_add_func ("/sizing/scrolledwindow/max_content_height_overlay_always", max_content_height_overlay_always);
g_test_add_func ("/sizing/scrolledwindow/min_max_content_width_overlay_always", min_max_content_width_overlay_always);
g_test_add_func ("/sizing/scrolledwindow/min_max_content_height_overlay_always", min_max_content_height_overlay_always);
g_test_add_func ("/sizing/scrolledwindow/min_content_width_fixed_always", min_content_width_fixed_always);
g_test_add_func ("/sizing/scrolledwindow/min_content_height_fixed_always", min_content_height_fixed_always);
g_test_add_func ("/sizing/scrolledwindow/max_content_width_fixed_always", max_content_width_fixed_always);
g_test_add_func ("/sizing/scrolledwindow/max_content_height_fixed_always", max_content_height_fixed_always);
g_test_add_func ("/sizing/scrolledwindow/min_max_content_width_fixed_always", min_max_content_width_fixed_always);
g_test_add_func ("/sizing/scrolledwindow/min_max_content_height_fixed_always", min_max_content_height_fixed_always);
return g_test_run (); return g_test_run ();
} }