[gtk+/gtk-3-22: 3/3] testsuite/scrolledwindow: Try non-overlay/non-auto

[Daniel Boles <dboles src gnome org>]

commit 2aa4248e8f08d213049b2e0ab8aa879a0ca17e36
Author: Daniel Boles <dboles src gnome org>
Date:   Fri Feb 24 22:46:05 2017 +0000

    testsuite/scrolledwindow: Try non-overlay/non-auto
    
    It was only testing the default configuration, where overlay scrolling
    is on and both scrollbars use POLICY_AUTOMATIC. We should also test the
    other 3 configurations that are available by including non-overlay
    scrollbars and/or those that use POLICY_ALWAYS.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=778853

 testsuite/gtk/scrolledwindow.c |  219 ++++++++++++++++++++++++++++++++++------
 1 files changed, 187 insertions(+), 32 deletions(-)
---
diff --git a/testsuite/gtk/scrolledwindow.c b/testsuite/gtk/scrolledwindow.c
index b62b323..c6093d8 100644
--- a/testsuite/gtk/scrolledwindow.c
+++ b/testsuite/gtk/scrolledwindow.c
@@ -11,11 +11,14 @@ typedef enum
 } TestProperty;
 
 static void
-test_size (GtkOrientation orientation,
+test_size (gboolean       overlay,
+           GtkPolicyType  policy,
+           GtkOrientation orientation,
            TestProperty   prop)
 {
   GtkWidget *scrolledwindow, *box;
-  int size, child_size;
+  int min_size, max_size, child_size;
+  int scrollbar_size = 0;
 
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_widget_set_hexpand (box, TRUE);
@@ -24,6 +27,8 @@ test_size (GtkOrientation orientation,
   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_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_widget_show_all (scrolledwindow);
 
@@ -34,9 +39,7 @@ test_size (GtkOrientation orientation,
         {
           gtk_scrolled_window_set_min_content_width (GTK_SCROLLED_WINDOW (scrolledwindow), MIN_SIZE);
 
-          gtk_widget_get_preferred_width (scrolledwindow, &size, NULL);
-
-          g_assert_cmpint (size, ==, MIN_SIZE);
+          gtk_widget_get_preferred_width (scrolledwindow, &min_size, NULL);
         }
 
       if (prop & MAXIMUM_CONTENT)
@@ -48,11 +51,17 @@ 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, NULL, &size);
+          gtk_widget_get_preferred_width (scrolledwindow, NULL, &max_size);
           gtk_widget_get_preferred_width (box, &child_size, NULL);
+        }
 
-          g_assert_cmpint (child_size, ==, BOX_SIZE);
-          g_assert_cmpint (size, ==, MAX_SIZE);
+      /* If the relevant scrollbar is non-overlay and always shown, it is added
+       * to the preferred size. When comparing to the expected size, we need to
+       * 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 */
@@ -62,9 +71,7 @@ test_size (GtkOrientation orientation,
         {
           gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (scrolledwindow), MIN_SIZE);
 
-          gtk_widget_get_preferred_height (scrolledwindow, &size, NULL);
-
-          g_assert_cmpint (size, ==, MIN_SIZE);
+          gtk_widget_get_preferred_height (scrolledwindow, &min_size, NULL);
         }
 
       if (prop & MAXIMUM_CONTENT)
@@ -76,66 +83,214 @@ 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, NULL, &size);
+          gtk_widget_get_preferred_height (scrolledwindow, NULL, &max_size);
           gtk_widget_get_preferred_height (box, &child_size, NULL);
+        }
 
-          g_assert_cmpint (child_size, ==, BOX_SIZE);
-          g_assert_cmpint (size, ==, MAX_SIZE);
+      if (!overlay && policy == GTK_POLICY_ALWAYS)
+        {
+          GtkWidget *scrollbar = gtk_scrolled_window_get_hscrollbar (GTK_SCROLLED_WINDOW (scrolledwindow));
+          gtk_widget_get_preferred_height (scrollbar, &scrollbar_size, NULL);
         }
     }
+
+  if (prop & MINIMUM_CONTENT)
+    {
+      min_size -= scrollbar_size;
+      g_assert_cmpint (min_size, ==, MIN_SIZE);
+    }
+
+  if (prop & MAXIMUM_CONTENT)
+    {
+      g_assert_cmpint (child_size, ==, BOX_SIZE);
+
+      max_size -= scrollbar_size;
+      g_assert_cmpint (max_size, ==, MAX_SIZE);
+    }
+}
+
+
+static void
+overlay_automatic_width_min (void)
+{
+  test_size (TRUE, GTK_POLICY_AUTOMATIC, GTK_ORIENTATION_HORIZONTAL, MINIMUM_CONTENT);
+}
+
+static void
+overlay_automatic_height_min (void)
+{
+  test_size (TRUE, GTK_POLICY_AUTOMATIC, GTK_ORIENTATION_VERTICAL, MINIMUM_CONTENT);
+}
+
+static void
+overlay_automatic_width_max (void)
+{
+  test_size (TRUE, GTK_POLICY_AUTOMATIC, GTK_ORIENTATION_HORIZONTAL, MAXIMUM_CONTENT);
+}
+
+static void
+overlay_automatic_height_max (void)
+{
+  test_size (TRUE, GTK_POLICY_AUTOMATIC, GTK_ORIENTATION_VERTICAL, MAXIMUM_CONTENT);
+}
+
+static void
+overlay_automatic_width_min_max (void)
+{
+  test_size (TRUE, GTK_POLICY_AUTOMATIC, GTK_ORIENTATION_HORIZONTAL, MINIMUM_CONTENT | MAXIMUM_CONTENT);
+}
+
+static void
+overlay_automatic_height_min_max (void)
+{
+  test_size (TRUE, GTK_POLICY_AUTOMATIC, GTK_ORIENTATION_VERTICAL, MINIMUM_CONTENT | MAXIMUM_CONTENT);
+}
+
+
+static void
+nonoverlay_automatic_width_min (void)
+{
+  test_size (FALSE, GTK_POLICY_AUTOMATIC, GTK_ORIENTATION_HORIZONTAL, MINIMUM_CONTENT);
+}
+
+static void
+nonoverlay_automatic_height_min (void)
+{
+  test_size (FALSE, GTK_POLICY_AUTOMATIC, GTK_ORIENTATION_VERTICAL, MINIMUM_CONTENT);
+}
+
+static void
+nonoverlay_automatic_width_max (void)
+{
+  test_size (FALSE, GTK_POLICY_AUTOMATIC, GTK_ORIENTATION_HORIZONTAL, MAXIMUM_CONTENT);
 }
 
+static void
+nonoverlay_automatic_height_max (void)
+{
+  test_size (FALSE, GTK_POLICY_AUTOMATIC, GTK_ORIENTATION_VERTICAL, MAXIMUM_CONTENT);
+}
 
 static void
-min_content_width (void)
+nonoverlay_automatic_width_min_max (void)
 {
-  test_size (GTK_ORIENTATION_HORIZONTAL, MINIMUM_CONTENT);
+  test_size (FALSE, GTK_POLICY_AUTOMATIC, GTK_ORIENTATION_HORIZONTAL, MINIMUM_CONTENT | MAXIMUM_CONTENT);
 }
 
 static void
-min_content_height (void)
+nonoverlay_automatic_height_min_max (void)
 {
-  test_size (GTK_ORIENTATION_VERTICAL, MINIMUM_CONTENT);
+  test_size (FALSE, GTK_POLICY_AUTOMATIC, GTK_ORIENTATION_VERTICAL, MINIMUM_CONTENT | MAXIMUM_CONTENT);
 }
 
+
 static void
-max_content_width (void)
+overlay_always_width_min (void)
 {
-  test_size (GTK_ORIENTATION_HORIZONTAL, MAXIMUM_CONTENT);
+  test_size (TRUE, GTK_POLICY_ALWAYS, GTK_ORIENTATION_HORIZONTAL, MINIMUM_CONTENT);
 }
 
 static void
-max_content_height (void)
+overlay_always_height_min (void)
 {
-  test_size (GTK_ORIENTATION_VERTICAL, MAXIMUM_CONTENT);
+  test_size (TRUE, GTK_POLICY_ALWAYS, GTK_ORIENTATION_VERTICAL, MINIMUM_CONTENT);
 }
 
 static void
-min_max_content_width (void)
+overlay_always_width_max (void)
 {
-  test_size (GTK_ORIENTATION_HORIZONTAL, MINIMUM_CONTENT | MAXIMUM_CONTENT);
+  test_size (TRUE, GTK_POLICY_ALWAYS, GTK_ORIENTATION_HORIZONTAL, MAXIMUM_CONTENT);
 }
 
 static void
-min_max_content_height (void)
+overlay_always_height_max (void)
+{
+  test_size (TRUE, GTK_POLICY_ALWAYS, GTK_ORIENTATION_VERTICAL, MAXIMUM_CONTENT);
+}
+
+static void
+overlay_always_width_min_max (void)
+{
+  test_size (TRUE, GTK_POLICY_ALWAYS, GTK_ORIENTATION_HORIZONTAL, MINIMUM_CONTENT | MAXIMUM_CONTENT);
+}
+
+static void
+overlay_always_height_min_max (void)
+{
+  test_size (TRUE, GTK_POLICY_ALWAYS, GTK_ORIENTATION_VERTICAL, MINIMUM_CONTENT | MAXIMUM_CONTENT);
+}
+
+
+static void
+nonoverlay_always_width_min (void)
 {
-  test_size (GTK_ORIENTATION_VERTICAL, MINIMUM_CONTENT | MAXIMUM_CONTENT);
+  test_size (FALSE, GTK_POLICY_ALWAYS, GTK_ORIENTATION_HORIZONTAL, MINIMUM_CONTENT);
 }
 
+static void
+nonoverlay_always_height_min (void)
+{
+  test_size (FALSE, GTK_POLICY_ALWAYS, GTK_ORIENTATION_VERTICAL, MINIMUM_CONTENT);
+}
+
+static void
+nonoverlay_always_width_max (void)
+{
+  test_size (FALSE, GTK_POLICY_ALWAYS, GTK_ORIENTATION_HORIZONTAL, MAXIMUM_CONTENT);
+}
+
+static void
+nonoverlay_always_height_max (void)
+{
+  test_size (FALSE, GTK_POLICY_ALWAYS, GTK_ORIENTATION_VERTICAL, MAXIMUM_CONTENT);
+}
+
+static void
+nonoverlay_always_width_min_max (void)
+{
+  test_size (FALSE, GTK_POLICY_ALWAYS, GTK_ORIENTATION_HORIZONTAL, MINIMUM_CONTENT | MAXIMUM_CONTENT);
+}
+
+static void
+nonoverlay_always_height_min_max (void)
+{
+  test_size (FALSE, GTK_POLICY_ALWAYS, GTK_ORIENTATION_VERTICAL, MINIMUM_CONTENT | MAXIMUM_CONTENT);
+}
+
+
 int
 main (int argc, char **argv)
 {
   gtk_init (&argc, &argv);
   g_test_init (&argc, &argv, NULL);
 
-  g_test_add_func ("/sizing/scrolledwindow/min_content_width", min_content_width);
-  g_test_add_func ("/sizing/scrolledwindow/min_content_height", min_content_height);
+  g_test_add_func ("/sizing/scrolledwindow/overlay_automatic_width_min", overlay_automatic_width_min);
+  g_test_add_func ("/sizing/scrolledwindow/overlay_automatic_height_min", overlay_automatic_height_min);
+  g_test_add_func ("/sizing/scrolledwindow/overlay_automatic_width_max", overlay_automatic_width_max);
+  g_test_add_func ("/sizing/scrolledwindow/overlay_automatic_height_max", overlay_automatic_height_max);
+  g_test_add_func ("/sizing/scrolledwindow/overlay_automatic_width_min_max", 
overlay_automatic_width_min_max);
+  g_test_add_func ("/sizing/scrolledwindow/overlay_automatic_height_min_max", 
overlay_automatic_height_min_max);
+
+  g_test_add_func ("/sizing/scrolledwindow/nonoverlay_automatic_width_min", nonoverlay_automatic_width_min);
+  g_test_add_func ("/sizing/scrolledwindow/nonoverlay_automatic_height_min", 
nonoverlay_automatic_height_min);
+  g_test_add_func ("/sizing/scrolledwindow/nonoverlay_automatic_width_max", nonoverlay_automatic_width_max);
+  g_test_add_func ("/sizing/scrolledwindow/nonoverlay_automatic_height_max", 
nonoverlay_automatic_height_max);
+  g_test_add_func ("/sizing/scrolledwindow/nonoverlay_automatic_width_min_max", 
nonoverlay_automatic_width_min_max);
+  g_test_add_func ("/sizing/scrolledwindow/nonoverlay_automatic_height_min_max", 
nonoverlay_automatic_height_min_max);
 
-  g_test_add_func ("/sizing/scrolledwindow/max_content_width", max_content_width);
-  g_test_add_func ("/sizing/scrolledwindow/max_content_height", max_content_height);
+  g_test_add_func ("/sizing/scrolledwindow/overlay_always_width_min", overlay_always_width_min);
+  g_test_add_func ("/sizing/scrolledwindow/overlay_always_height_min", overlay_always_height_min);
+  g_test_add_func ("/sizing/scrolledwindow/overlay_always_width_max", overlay_always_width_max);
+  g_test_add_func ("/sizing/scrolledwindow/overlay_always_height_max", overlay_always_height_max);
+  g_test_add_func ("/sizing/scrolledwindow/overlay_always_width_min_max", overlay_always_width_min_max);
+  g_test_add_func ("/sizing/scrolledwindow/overlay_always_height_min_max", overlay_always_height_min_max);
 
-  g_test_add_func ("/sizing/scrolledwindow/min_max_content_width", min_max_content_width);
-  g_test_add_func ("/sizing/scrolledwindow/min_max_content_height", min_max_content_height);
+  g_test_add_func ("/sizing/scrolledwindow/nonoverlay_always_width_min", nonoverlay_always_width_min);
+  g_test_add_func ("/sizing/scrolledwindow/nonoverlay_always_height_min", nonoverlay_always_height_min);
+  g_test_add_func ("/sizing/scrolledwindow/nonoverlay_always_width_max", nonoverlay_always_width_max);
+  g_test_add_func ("/sizing/scrolledwindow/nonoverlay_always_height_max", nonoverlay_always_height_max);
+  g_test_add_func ("/sizing/scrolledwindow/nonoverlay_always_width_min_max", 
nonoverlay_always_width_min_max);
+  g_test_add_func ("/sizing/scrolledwindow/nonoverlay_always_height_min_max", 
nonoverlay_always_height_min_max);
 
   return g_test_run ();
 }