From 1bb3501ef79d00601db279671afb7ce399b0c5ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timm=20B=C3=A4der?= Date: Mon, 17 Oct 2016 09:14:39 +0200 Subject: [PATCH] Fix unittests --- testsuite/a11y/buttons.txt | 6 +- testsuite/a11y/buttons.ui | 13 ----- testsuite/a11y/hello-world.ui | 1 - testsuite/a11y/infobar.txt | 3 +- testsuite/a11y/menu.ui | 13 ----- testsuite/a11y/menubutton.txt | 2 +- testsuite/a11y/menubutton.ui | 1 - testsuite/a11y/menubutton2.txt | 2 +- testsuite/a11y/menubutton3.txt | 2 +- testsuite/a11y/menus.ui | 8 --- testsuite/css/nodes/buttons.ui | 15 +---- testsuite/gtk/builder.c | 57 ++---------------- testsuite/gtk/cssprovider.c | 8 +-- testsuite/gtk/ui/image1.expected | 2 +- testsuite/gtk/ui/image1.ui | 4 +- testsuite/reftests/background-area.ref.ui | 4 -- testsuite/reftests/background-area.ui | 3 - .../background-color-transparent.ref.ui | 2 - .../reftests/background-color-transparent.ui | 2 - .../reftests/background-image-multiple.ref.ui | 7 --- .../reftests/background-image-multiple.ui | 5 -- testsuite/reftests/background-origin.ref.ui | 1 - testsuite/reftests/background-origin.ui | 9 --- .../background-position-repeat.ref.ui | 2 - .../reftests/background-position-repeat.ui | 2 - testsuite/reftests/background-position.ref.ui | 18 ------ testsuite/reftests/background-position.ui | 18 ------ .../background-positioning-area-empty.ref.ui | 2 - .../background-positioning-area-empty.ui | 2 - .../reftests/background-size-keywords.ref.ui | 24 -------- .../reftests/background-size-keywords.ui | 24 -------- testsuite/reftests/background-size.ref.ui | 24 -------- testsuite/reftests/background-size.ui | 24 -------- .../reftests/border-color-default.ref.ui | 1 - testsuite/reftests/border-color-default.ui | 1 - testsuite/reftests/border-half-pixel.ref.ui | 1 - testsuite/reftests/border-half-pixel.ui | 1 - .../reftests/border-image-gradient.ref.ui | 1 - testsuite/reftests/border-image-gradient.ui | 1 - .../reftests/border-image-url-scaled.ref.ui | 3 - testsuite/reftests/border-image-url-scaled.ui | 1 - testsuite/reftests/border-image-url.ref.ui | 1 - testsuite/reftests/border-image-url.ui | 1 - testsuite/reftests/border-style-none.ref.ui | 1 - testsuite/reftests/border-style-none.ui | 1 - testsuite/reftests/border-style.ref.ui | 1 - testsuite/reftests/border-style.ui | 4 -- testsuite/reftests/box-pseudo-classes.ref.ui | 15 ----- testsuite/reftests/box-pseudo-classes.ui | 15 ----- .../css-match-inherit-different-state.ref.ui | 2 - .../css-match-inherit-different-state.ui | 2 - testsuite/reftests/css-match-inherit.ref.ui | 1 - testsuite/reftests/css-match-inherit.ui | 1 - testsuite/reftests/css-multi-state.ref.ui | 2 - testsuite/reftests/css-multi-state.ui | 2 - testsuite/reftests/inherit-and-initial.ref.ui | 58 +------------------ testsuite/reftests/inherit-and-initial.ui | 58 +------------------ testsuite/reftests/linear-gradient.ref.ui | 8 --- testsuite/reftests/linear-gradient.ui | 8 --- testsuite/reftests/opacity.ref.ui | 2 - testsuite/reftests/opacity.ui | 2 - .../style-properties-nth-child.ref.ui | 2 - .../reftests/style-properties-nth-child.ui | 2 - 63 files changed, 24 insertions(+), 485 deletions(-) diff --git a/testsuite/a11y/buttons.txt b/testsuite/a11y/buttons.txt index 9568e0473a..e39b3a10ba 100644 --- a/testsuite/a11y/buttons.txt +++ b/testsuite/a11y/buttons.txt @@ -20,14 +20,13 @@ window1 "push button" parent: grid1 index: 0 - name: Close state: enabled focusable sensitive showing visible toolkit: gtk layer: widget alpha: 1 - image size: 16 x 16 + image size: -1 x -1 image description: (null) action 0 name: click @@ -36,14 +35,13 @@ window1 "push button" parent: grid1 index: 1 - name: Find and Replace state: enabled focusable sensitive showing visible toolkit: gtk layer: widget alpha: 1 - image size: 16 x 16 + image size: -1 x -1 image description: (null) action 0 name: click diff --git a/testsuite/a11y/buttons.ui b/testsuite/a11y/buttons.ui index 2489f6022e..7b86217d81 100644 --- a/testsuite/a11y/buttons.ui +++ b/testsuite/a11y/buttons.ui @@ -107,7 +107,6 @@ True True True - image8 center center @@ -123,7 +122,6 @@ True center center - image9 2 @@ -133,15 +131,4 @@ - - True - edit-find-replace - 1 - - - True - window-close-symbolic - True - 1 - diff --git a/testsuite/a11y/hello-world.ui b/testsuite/a11y/hello-world.ui index 3dc807570f..589a12c7ca 100644 --- a/testsuite/a11y/hello-world.ui +++ b/testsuite/a11y/hello-world.ui @@ -10,7 +10,6 @@ True True True - False diff --git a/testsuite/a11y/infobar.txt b/testsuite/a11y/infobar.txt index b8d4c7e725..fc63dadbd3 100644 --- a/testsuite/a11y/infobar.txt +++ b/testsuite/a11y/infobar.txt @@ -97,13 +97,14 @@ window1 "push button" parent: content index: 2 + name: Close state: enabled focusable sensitive toolkit: gtk layer: widget alpha: 1 - image size: -1 x -1 + image size: 16 x 16 image description: (null) action 0 name: click diff --git a/testsuite/a11y/menu.ui b/testsuite/a11y/menu.ui index c551e08d5f..19d2c31568 100644 --- a/testsuite/a11y/menu.ui +++ b/testsuite/a11y/menu.ui @@ -11,7 +11,6 @@ True False - False _File True @@ -22,14 +21,12 @@ True False - False True False - False awesome True True @@ -39,7 +36,6 @@ True False - False @@ -47,7 +43,6 @@ _Quit True False - False True @@ -59,7 +54,6 @@ True False - False _Edit True @@ -71,7 +65,6 @@ Cu_t True False - False True @@ -80,7 +73,6 @@ _Copy True False - False True @@ -89,7 +81,6 @@ _Paste True False - False True @@ -98,7 +89,6 @@ _Delete True False - False True @@ -110,7 +100,6 @@ True False - False _View True @@ -119,7 +108,6 @@ True False - False _Help True @@ -131,7 +119,6 @@ _About True False - False True diff --git a/testsuite/a11y/menubutton.txt b/testsuite/a11y/menubutton.txt index f896294b7d..b98486153c 100644 --- a/testsuite/a11y/menubutton.txt +++ b/testsuite/a11y/menubutton.txt @@ -26,7 +26,7 @@ window1 layer: widget alpha: 1 - image size: -1 x -1 + image size: 16 x 16 image description: (null) action 0 name: click diff --git a/testsuite/a11y/menubutton.ui b/testsuite/a11y/menubutton.ui index 611fe99d89..576a9c6101 100644 --- a/testsuite/a11y/menubutton.ui +++ b/testsuite/a11y/menubutton.ui @@ -9,7 +9,6 @@ _New True False - False True diff --git a/testsuite/a11y/menubutton2.txt b/testsuite/a11y/menubutton2.txt index 32b6b73647..f71a5a20d5 100644 --- a/testsuite/a11y/menubutton2.txt +++ b/testsuite/a11y/menubutton2.txt @@ -26,7 +26,7 @@ window1 layer: widget alpha: 1 - image size: -1 x -1 + image size: 16 x 16 image description: (null) action 0 name: click diff --git a/testsuite/a11y/menubutton3.txt b/testsuite/a11y/menubutton3.txt index 32b6b73647..f71a5a20d5 100644 --- a/testsuite/a11y/menubutton3.txt +++ b/testsuite/a11y/menubutton3.txt @@ -26,7 +26,7 @@ window1 layer: widget alpha: 1 - image size: -1 x -1 + image size: 16 x 16 image description: (null) action 0 name: click diff --git a/testsuite/a11y/menus.ui b/testsuite/a11y/menus.ui index 3445b72d88..81b55f3bd4 100644 --- a/testsuite/a11y/menus.ui +++ b/testsuite/a11y/menus.ui @@ -11,7 +11,6 @@ True False - False _File True @@ -23,7 +22,6 @@ _New True False - False True @@ -32,21 +30,18 @@ bla True False - False True False - False True False - False check item True @@ -59,7 +54,6 @@ True False - False _Edit True @@ -70,7 +64,6 @@ True False - False radio1 True True @@ -80,7 +73,6 @@ True False - False radio2 True True diff --git a/testsuite/css/nodes/buttons.ui b/testsuite/css/nodes/buttons.ui index 2489f6022e..826f840769 100644 --- a/testsuite/css/nodes/buttons.ui +++ b/testsuite/css/nodes/buttons.ui @@ -107,7 +107,7 @@ True True True - image8 + edit-find-replace center center @@ -123,7 +123,7 @@ True center center - image9 + window-close-symbolic 2 @@ -133,15 +133,4 @@ - - True - edit-find-replace - 1 - - - True - window-close-symbolic - True - 1 - diff --git a/testsuite/gtk/builder.c b/testsuite/gtk/builder.c index 36f0e0e5fd..93338f78d0 100644 --- a/testsuite/gtk/builder.c +++ b/testsuite/gtk/builder.c @@ -647,8 +647,6 @@ test_types (void) { const gchar buffer[] = "" - " " - " " " " " " " " @@ -2016,54 +2014,6 @@ test_add_objects (void) obj = gtk_builder_get_object (builder, "mainbox"); g_assert (GTK_IS_WIDGET (obj)); g_object_unref (builder); - - /* test cherry picking a ui manager and menubar that depends on it */ - error = NULL; - builder = gtk_builder_new (); - ret = gtk_builder_add_objects_from_string (builder, buffer2, -1, objects3, &error); - g_assert (ret); - obj = gtk_builder_get_object (builder, "uimgr1"); - g_assert (GTK_IS_LABEL (obj)); - obj = gtk_builder_get_object (builder, "file"); - g_assert (GTK_IS_ACTION (obj)); - obj = gtk_builder_get_object (builder, "menubar1"); - g_assert (GTK_IS_MENU_BAR (obj)); - menubar = GTK_WIDGET (obj); - - children = gtk_container_get_children (GTK_CONTAINER (menubar)); - menu = children->data; - g_assert (menu != NULL); - g_assert (GTK_IS_MENU_ITEM (menu)); - g_assert (strcmp (gtk_widget_get_name (GTK_WIDGET (menu)), "file") == 0); - g_list_free (children); - - label = G_OBJECT (gtk_bin_get_child (GTK_BIN (menu))); - g_assert (label != NULL); - g_assert (GTK_IS_LABEL (label)); - g_assert (strcmp (gtk_label_get_text (GTK_LABEL (label)), "File") == 0); - - g_object_unref (builder); - - /* test cherry picking just the ui manager */ - error = NULL; - builder = gtk_builder_new (); - ret = gtk_builder_add_objects_from_string (builder, buffer2, -1, objects4, &error); - g_assert (ret); - obj = gtk_builder_get_object (builder, "uimgr1"); - - children = gtk_container_get_children (GTK_CONTAINER (menubar)); - menu = children->data; - g_assert (menu != NULL); - g_assert (GTK_IS_MENU_ITEM (menu)); - g_assert (strcmp (gtk_widget_get_name (GTK_WIDGET (menu)), "file") == 0); - g_list_free (children); - - label = G_OBJECT (gtk_bin_get_child (GTK_BIN (menu))); - g_assert (label != NULL); - g_assert (GTK_IS_LABEL (label)); - g_assert (strcmp (gtk_label_get_text (GTK_LABEL (label)), "File") == 0); - - g_object_unref (builder); } static GtkWidget * @@ -2448,13 +2398,14 @@ test_expose_object (void) const gchar buffer[] = "" " " - " external_menu" + " external_menu" " " " " " " ""; - menu = gtk_menu_new (); + /*menu = gtk_menu_new ();*/ + menu = gtk_popover_new (NULL); builder = gtk_builder_new (); gtk_builder_expose_object (builder, "external_menu", G_OBJECT (menu)); gtk_builder_expose_object (builder, "builder", G_OBJECT (builder)); @@ -2464,7 +2415,7 @@ test_expose_object (void) obj = gtk_builder_get_object (builder, "button"); g_assert (GTK_IS_BUTTON (obj)); - g_assert (gtk_menu_button_get_popup (GTK_MENU_BUTTON (obj)) == GTK_MENU (menu)); + g_assert (gtk_menu_button_get_popover (GTK_MENU_BUTTON (obj)) == GTK_POPOVER (menu)); /* Connect signals and fake clicked event */ gtk_builder_connect_signals (builder, NULL); diff --git a/testsuite/gtk/cssprovider.c b/testsuite/gtk/cssprovider.c index c0d2c88d2e..0272c6b9fd 100644 --- a/testsuite/gtk/cssprovider.c +++ b/testsuite/gtk/cssprovider.c @@ -33,13 +33,13 @@ test_section_in_style_property (void) provider = gtk_css_provider_new (); g_signal_connect (provider, "parsing-error", G_CALLBACK (assert_section_is_not_null), NULL); - gtk_css_provider_load_from_data (provider, "* { -GtkWindow-decoration-button-layout: random garbage goes here; }", -1); + gtk_css_provider_load_from_data (provider, "* { -GtkTreeView:indent-expanders: random garbage goes here; }", -1); - widget_class = g_type_class_ref (GTK_TYPE_WINDOW); - pspec = gtk_widget_class_find_style_property (widget_class, "decoration-button-layout"); + widget_class = g_type_class_ref (GTK_TYPE_TREE_VIEW); + pspec = gtk_widget_class_find_style_property (widget_class, "indent-expanders"); g_assert (pspec); path = gtk_widget_path_new (); - gtk_widget_path_append_type (path, GTK_TYPE_WINDOW); + gtk_widget_path_append_type (path, GTK_TYPE_TREE_VIEW); G_GNUC_BEGIN_IGNORE_DEPRECATIONS; gtk_style_provider_get_style_property (GTK_STYLE_PROVIDER (provider), path, 0, pspec, &value); diff --git a/testsuite/gtk/ui/image1.expected b/testsuite/gtk/ui/image1.expected index bc8a4357fb..bfcc682c30 100644 --- a/testsuite/gtk/ui/image1.expected +++ b/testsuite/gtk/ui/image1.expected @@ -1,2 +1,2 @@ ERROR: gtk-builder-error-quark 13 -.:3:29 Object with ID xyzzy not found +.:3:31 Object with ID xyzzy not found diff --git a/testsuite/gtk/ui/image1.ui b/testsuite/gtk/ui/image1.ui index a60160b44b..0e3dddd057 100644 --- a/testsuite/gtk/ui/image1.ui +++ b/testsuite/gtk/ui/image1.ui @@ -1,6 +1,6 @@ - - xyzzy + + xyzzy diff --git a/testsuite/reftests/background-area.ref.ui b/testsuite/reftests/background-area.ref.ui index 9d9b72b12e..4d63083dd0 100644 --- a/testsuite/reftests/background-area.ref.ui +++ b/testsuite/reftests/background-area.ref.ui @@ -16,7 +16,6 @@ True True True - False 144 70 @@ -27,7 +26,6 @@ True True True - False 144 70 @@ -38,7 +36,6 @@ True True True - False 144 70 @@ -47,7 +44,6 @@ True True True - False diff --git a/testsuite/reftests/background-area.ui b/testsuite/reftests/background-area.ui index 53dfab8e3d..d9f1303835 100644 --- a/testsuite/reftests/background-area.ui +++ b/testsuite/reftests/background-area.ui @@ -16,7 +16,6 @@ True True True - False 144 70 @@ -27,7 +26,6 @@ True True True - False 144 70 @@ -38,7 +36,6 @@ True True True - False 144 70 diff --git a/testsuite/reftests/background-color-transparent.ref.ui b/testsuite/reftests/background-color-transparent.ref.ui index 9db4ae1e86..1afe963e45 100644 --- a/testsuite/reftests/background-color-transparent.ref.ui +++ b/testsuite/reftests/background-color-transparent.ref.ui @@ -13,7 +13,6 @@ True True True - False 0 @@ -28,7 +27,6 @@ True True True - False diff --git a/testsuite/reftests/background-color-transparent.ui b/testsuite/reftests/background-color-transparent.ui index d2b0c0c4eb..f0bcfce9e9 100644 --- a/testsuite/reftests/background-color-transparent.ui +++ b/testsuite/reftests/background-color-transparent.ui @@ -13,7 +13,6 @@ True True True - False 0 @@ -28,7 +27,6 @@ True True True - False diff --git a/testsuite/reftests/background-image-multiple.ref.ui b/testsuite/reftests/background-image-multiple.ref.ui index bf16bc421f..e8218af6b1 100644 --- a/testsuite/reftests/background-image-multiple.ref.ui +++ b/testsuite/reftests/background-image-multiple.ref.ui @@ -16,7 +16,6 @@ True True True - False 144 70 @@ -27,7 +26,6 @@ True True True - False 144 70 @@ -38,7 +36,6 @@ True True True - False 144 70 @@ -55,7 +52,6 @@ True True True - False 144 70 @@ -70,7 +66,6 @@ True True True - False 120 46 @@ -93,7 +88,6 @@ True True True - False 144 70 @@ -108,7 +102,6 @@ True True True - False 120 46 diff --git a/testsuite/reftests/background-image-multiple.ui b/testsuite/reftests/background-image-multiple.ui index a444f74342..1d212e6136 100644 --- a/testsuite/reftests/background-image-multiple.ui +++ b/testsuite/reftests/background-image-multiple.ui @@ -16,7 +16,6 @@ True True True - False 144 70 @@ -27,7 +26,6 @@ True True True - False 144 70 @@ -38,7 +36,6 @@ True True True - False 144 70 @@ -49,7 +46,6 @@ True True True - False 144 70 @@ -60,7 +56,6 @@ True True True - False 144 70 diff --git a/testsuite/reftests/background-origin.ref.ui b/testsuite/reftests/background-origin.ref.ui index d1e1cc739d..804fd56615 100644 --- a/testsuite/reftests/background-origin.ref.ui +++ b/testsuite/reftests/background-origin.ref.ui @@ -12,7 +12,6 @@ True True True - False diff --git a/testsuite/reftests/background-origin.ui b/testsuite/reftests/background-origin.ui index 1f22d326bb..ab28b735f2 100644 --- a/testsuite/reftests/background-origin.ui +++ b/testsuite/reftests/background-origin.ui @@ -16,7 +16,6 @@ True True True - False 144 70 @@ -27,7 +26,6 @@ True True True - False 144 70 @@ -38,7 +36,6 @@ True True True - False 144 70 @@ -49,7 +46,6 @@ True True True - False 144 70 @@ -60,7 +56,6 @@ True True True - False 144 70 @@ -71,7 +66,6 @@ True True True - False 144 70 @@ -82,7 +76,6 @@ True True True - False 144 70 @@ -93,7 +86,6 @@ True True True - False 144 70 @@ -104,7 +96,6 @@ True True True - False 144 70 diff --git a/testsuite/reftests/background-position-repeat.ref.ui b/testsuite/reftests/background-position-repeat.ref.ui index ef7502bf23..5a25d1be7c 100644 --- a/testsuite/reftests/background-position-repeat.ref.ui +++ b/testsuite/reftests/background-position-repeat.ref.ui @@ -7,13 +7,11 @@ button1_ref - False 40 41 True True True - False diff --git a/testsuite/reftests/background-position-repeat.ui b/testsuite/reftests/background-position-repeat.ui index e7b08d16a9..057db36567 100644 --- a/testsuite/reftests/background-position-repeat.ui +++ b/testsuite/reftests/background-position-repeat.ui @@ -7,13 +7,11 @@ button1 - False 40 41 True True True - False diff --git a/testsuite/reftests/background-position.ref.ui b/testsuite/reftests/background-position.ref.ui index 020d1e8bfd..abbbec1aaa 100644 --- a/testsuite/reftests/background-position.ref.ui +++ b/testsuite/reftests/background-position.ref.ui @@ -13,13 +13,11 @@ 120 - False 20 20 True True True - False ref @@ -29,13 +27,11 @@ - False 20 20 True True True - False ref @@ -45,13 +41,11 @@ - False 20 20 True True True - False ref @@ -61,13 +55,11 @@ - False 20 20 True True True - False ref @@ -77,13 +69,11 @@ - False 20 20 True True True - False ref @@ -93,13 +83,11 @@ - False 20 20 True True True - False ref @@ -109,13 +97,11 @@ - False 20 20 True True True - False ref @@ -125,13 +111,11 @@ - False 10 20 True True True - False ref @@ -141,13 +125,11 @@ - False 20 20 True True True - False ref diff --git a/testsuite/reftests/background-position.ui b/testsuite/reftests/background-position.ui index 8fcebbb332..94e088e1a1 100644 --- a/testsuite/reftests/background-position.ui +++ b/testsuite/reftests/background-position.ui @@ -12,13 +12,11 @@ 0 - False 40 40 True True True - False a @@ -30,13 +28,11 @@ - False 40 40 True True True - False b @@ -48,13 +44,11 @@ - False 40 40 True True True - False c @@ -66,13 +60,11 @@ - False 40 40 True True True - False d @@ -84,13 +76,11 @@ - False 40 40 True True True - False e @@ -102,13 +92,11 @@ - False 40 40 True True True - False f @@ -120,13 +108,11 @@ - False 40 40 True True True - False g @@ -138,13 +124,11 @@ - False 40 40 True True True - False h @@ -156,13 +140,11 @@ - False 40 40 True True True - False i diff --git a/testsuite/reftests/background-positioning-area-empty.ref.ui b/testsuite/reftests/background-positioning-area-empty.ref.ui index a36f31dbab..7e5c85572e 100644 --- a/testsuite/reftests/background-positioning-area-empty.ref.ui +++ b/testsuite/reftests/background-positioning-area-empty.ref.ui @@ -6,11 +6,9 @@ popup - False True False True - False diff --git a/testsuite/reftests/background-positioning-area-empty.ui b/testsuite/reftests/background-positioning-area-empty.ui index a36f31dbab..7e5c85572e 100644 --- a/testsuite/reftests/background-positioning-area-empty.ui +++ b/testsuite/reftests/background-positioning-area-empty.ui @@ -6,11 +6,9 @@ popup - False True False True - False diff --git a/testsuite/reftests/background-size-keywords.ref.ui b/testsuite/reftests/background-size-keywords.ref.ui index e012156a3a..20294b38a4 100644 --- a/testsuite/reftests/background-size-keywords.ref.ui +++ b/testsuite/reftests/background-size-keywords.ref.ui @@ -12,13 +12,11 @@ A - False 40 30 True True True - False a @@ -31,13 +29,11 @@ B - False 40 30 True True True - False b @@ -50,13 +46,11 @@ C - False 40 30 True True True - False c @@ -69,13 +63,11 @@ D - False 40 30 True True True - False d @@ -88,13 +80,11 @@ E - False 40 30 True True True - False e @@ -107,13 +97,11 @@ F - False 40 30 True True True - False f @@ -126,13 +114,11 @@ G - False 40 30 True True True - False g @@ -145,13 +131,11 @@ H - False 40 30 True True True - False h @@ -164,13 +148,11 @@ I - False 40 30 True True True - False i @@ -183,13 +165,11 @@ J - False 40 30 True True True - False j @@ -202,13 +182,11 @@ K - False 40 30 True True True - False k @@ -221,13 +199,11 @@ L - False 40 30 True True True - False l diff --git a/testsuite/reftests/background-size-keywords.ui b/testsuite/reftests/background-size-keywords.ui index 4b7f9cabf4..71c48676cd 100644 --- a/testsuite/reftests/background-size-keywords.ui +++ b/testsuite/reftests/background-size-keywords.ui @@ -11,13 +11,11 @@ A - False 40 30 True True True - False a @@ -30,13 +28,11 @@ B - False 40 30 True True True - False b @@ -49,13 +45,11 @@ C - False 40 30 True True True - False c @@ -68,13 +62,11 @@ D - False 40 30 True True True - False d @@ -87,13 +79,11 @@ E - False 40 30 True True True - False e @@ -106,13 +96,11 @@ F - False 40 30 True True True - False f @@ -125,13 +113,11 @@ G - False 40 30 True True True - False g @@ -144,13 +130,11 @@ H - False 40 30 True True True - False h @@ -163,13 +147,11 @@ I - False 40 30 True True True - False i @@ -182,13 +164,11 @@ J - False 40 30 True True True - False j @@ -201,13 +181,11 @@ K - False 40 30 True True True - False k @@ -220,13 +198,11 @@ L - False 40 30 True True True - False l diff --git a/testsuite/reftests/background-size.ref.ui b/testsuite/reftests/background-size.ref.ui index 64c772af69..2a2374a159 100644 --- a/testsuite/reftests/background-size.ref.ui +++ b/testsuite/reftests/background-size.ref.ui @@ -12,13 +12,11 @@ A - False 40 40 True True True - False a @@ -31,13 +29,11 @@ B - False 40 40 True True True - False b @@ -50,13 +46,11 @@ C - False 40 40 True True True - False c @@ -69,13 +63,11 @@ D - False 40 40 True True True - False d @@ -88,13 +80,11 @@ E - False 40 40 True True True - False e @@ -107,13 +97,11 @@ F - False 40 40 True True True - False f @@ -126,13 +114,11 @@ G - False 40 40 True True True - False g @@ -145,13 +131,11 @@ H - False 40 40 True True True - False h @@ -164,13 +148,11 @@ I - False 40 40 True True True - False i @@ -183,13 +165,11 @@ J - False 40 40 True True True - False j @@ -202,13 +182,11 @@ K - False 40 40 True True True - False k @@ -221,13 +199,11 @@ L - False 40 40 True True True - False l diff --git a/testsuite/reftests/background-size.ui b/testsuite/reftests/background-size.ui index b0645dbba8..1de1219972 100644 --- a/testsuite/reftests/background-size.ui +++ b/testsuite/reftests/background-size.ui @@ -11,13 +11,11 @@ A - False 40 40 True True True - False a @@ -30,13 +28,11 @@ B - False 40 40 True True True - False b @@ -49,13 +45,11 @@ C - False 40 40 True True True - False c @@ -68,13 +62,11 @@ D - False 40 40 True True True - False d @@ -87,13 +79,11 @@ E - False 40 40 True True True - False e @@ -106,13 +96,11 @@ F - False 40 40 True True True - False f @@ -125,13 +113,11 @@ G - False 40 40 True True True - False g @@ -144,13 +130,11 @@ H - False 40 40 True True True - False h @@ -163,13 +147,11 @@ I - False 40 40 True True True - False i @@ -182,13 +164,11 @@ J - False 40 40 True True True - False j @@ -201,13 +181,11 @@ K - False 40 40 True True True - False k @@ -220,13 +198,11 @@ L - False 40 40 True True True - False l diff --git a/testsuite/reftests/border-color-default.ref.ui b/testsuite/reftests/border-color-default.ref.ui index f648f97eb7..c6aa81d1ce 100644 --- a/testsuite/reftests/border-color-default.ref.ui +++ b/testsuite/reftests/border-color-default.ref.ui @@ -10,7 +10,6 @@ True True True - False diff --git a/testsuite/reftests/border-color-default.ui b/testsuite/reftests/border-color-default.ui index 99cdcd3709..248cd28c0b 100644 --- a/testsuite/reftests/border-color-default.ui +++ b/testsuite/reftests/border-color-default.ui @@ -9,7 +9,6 @@ True True True - False diff --git a/testsuite/reftests/border-half-pixel.ref.ui b/testsuite/reftests/border-half-pixel.ref.ui index f648f97eb7..c6aa81d1ce 100644 --- a/testsuite/reftests/border-half-pixel.ref.ui +++ b/testsuite/reftests/border-half-pixel.ref.ui @@ -10,7 +10,6 @@ True True True - False diff --git a/testsuite/reftests/border-half-pixel.ui b/testsuite/reftests/border-half-pixel.ui index 99cdcd3709..248cd28c0b 100644 --- a/testsuite/reftests/border-half-pixel.ui +++ b/testsuite/reftests/border-half-pixel.ui @@ -9,7 +9,6 @@ True True True - False diff --git a/testsuite/reftests/border-image-gradient.ref.ui b/testsuite/reftests/border-image-gradient.ref.ui index acc9280d01..e039ffcbd5 100644 --- a/testsuite/reftests/border-image-gradient.ref.ui +++ b/testsuite/reftests/border-image-gradient.ref.ui @@ -12,7 +12,6 @@ True True True - False diff --git a/testsuite/reftests/border-image-gradient.ui b/testsuite/reftests/border-image-gradient.ui index eb275fdfce..483f5031b4 100644 --- a/testsuite/reftests/border-image-gradient.ui +++ b/testsuite/reftests/border-image-gradient.ui @@ -12,7 +12,6 @@ True True True - False diff --git a/testsuite/reftests/border-image-url-scaled.ref.ui b/testsuite/reftests/border-image-url-scaled.ref.ui index 2b61dadeb8..959d3fd398 100644 --- a/testsuite/reftests/border-image-url-scaled.ref.ui +++ b/testsuite/reftests/border-image-url-scaled.ref.ui @@ -11,7 +11,6 @@ True True True - False @@ -22,7 +21,6 @@ True True True - False @@ -34,7 +32,6 @@ True True True - False diff --git a/testsuite/reftests/border-image-url-scaled.ui b/testsuite/reftests/border-image-url-scaled.ui index eb275fdfce..483f5031b4 100644 --- a/testsuite/reftests/border-image-url-scaled.ui +++ b/testsuite/reftests/border-image-url-scaled.ui @@ -12,7 +12,6 @@ True True True - False diff --git a/testsuite/reftests/border-image-url.ref.ui b/testsuite/reftests/border-image-url.ref.ui index acc9280d01..e039ffcbd5 100644 --- a/testsuite/reftests/border-image-url.ref.ui +++ b/testsuite/reftests/border-image-url.ref.ui @@ -12,7 +12,6 @@ True True True - False diff --git a/testsuite/reftests/border-image-url.ui b/testsuite/reftests/border-image-url.ui index eb275fdfce..483f5031b4 100644 --- a/testsuite/reftests/border-image-url.ui +++ b/testsuite/reftests/border-image-url.ui @@ -12,7 +12,6 @@ True True True - False diff --git a/testsuite/reftests/border-style-none.ref.ui b/testsuite/reftests/border-style-none.ref.ui index 2fce514684..9dc4de78f1 100644 --- a/testsuite/reftests/border-style-none.ref.ui +++ b/testsuite/reftests/border-style-none.ref.ui @@ -10,7 +10,6 @@ True True True - False 144 144 diff --git a/testsuite/reftests/border-style-none.ui b/testsuite/reftests/border-style-none.ui index 7b3abc5dac..58c2416bf9 100644 --- a/testsuite/reftests/border-style-none.ui +++ b/testsuite/reftests/border-style-none.ui @@ -9,7 +9,6 @@ True True True - False 144 144 diff --git a/testsuite/reftests/border-style.ref.ui b/testsuite/reftests/border-style.ref.ui index 904e6a9a6b..c4e87381f2 100644 --- a/testsuite/reftests/border-style.ref.ui +++ b/testsuite/reftests/border-style.ref.ui @@ -13,7 +13,6 @@ True True True - False 40 40 diff --git a/testsuite/reftests/css-match-inherit.ui b/testsuite/reftests/css-match-inherit.ui index e2e9f6644b..01f5a84717 100644 --- a/testsuite/reftests/css-match-inherit.ui +++ b/testsuite/reftests/css-match-inherit.ui @@ -12,7 +12,6 @@ True True True - False diff --git a/testsuite/reftests/css-multi-state.ref.ui b/testsuite/reftests/css-multi-state.ref.ui index 4ebe52c2eb..5b4e55a936 100644 --- a/testsuite/reftests/css-multi-state.ref.ui +++ b/testsuite/reftests/css-multi-state.ref.ui @@ -6,11 +6,9 @@ popup - False True True True - False True reference False diff --git a/testsuite/reftests/css-multi-state.ui b/testsuite/reftests/css-multi-state.ui index d3c77af413..1a3aaa6fb9 100644 --- a/testsuite/reftests/css-multi-state.ui +++ b/testsuite/reftests/css-multi-state.ui @@ -6,11 +6,9 @@ popup - False True True True - False True False diff --git a/testsuite/reftests/inherit-and-initial.ref.ui b/testsuite/reftests/inherit-and-initial.ref.ui index 0c10ae54c5..6ce4e3e5c3 100644 --- a/testsuite/reftests/inherit-and-initial.ref.ui +++ b/testsuite/reftests/inherit-and-initial.ref.ui @@ -71,7 +71,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit True False - False _File True @@ -85,7 +84,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit True False - False True @@ -95,7 +93,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit True False - False True @@ -105,7 +102,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit True False - False True @@ -115,7 +111,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit True False - False True @@ -124,7 +119,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit True False - False @@ -133,7 +127,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit True False - False True @@ -146,7 +139,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit True False - False _Edit True @@ -160,7 +152,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit True True - False True @@ -170,7 +161,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit True False - False True @@ -180,7 +170,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit True False - False True @@ -190,7 +179,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit True False - False True @@ -200,7 +188,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit True False - False True @@ -215,7 +202,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True True False - False True @@ -227,7 +213,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True False False - False True @@ -240,7 +225,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True True False - False True @@ -252,7 +236,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True True False - False True @@ -264,7 +247,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True False False - False True @@ -277,7 +259,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True False False - False True @@ -295,7 +276,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True True False - False True @@ -307,7 +287,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True False False - False True @@ -320,7 +299,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True True False - False True @@ -332,7 +310,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True True False - False True @@ -344,7 +321,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True False False - False True @@ -357,7 +333,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True False False - False True @@ -374,7 +349,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit True False - False _View True @@ -388,7 +362,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit True False - False True @@ -401,7 +374,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit True False - False _Help True @@ -415,7 +387,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit True False - False True @@ -443,7 +414,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit True False - False Save True document-save @@ -458,7 +428,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit True False - False Open True document-open @@ -473,7 +442,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit True False - False False @@ -485,7 +453,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit True False - False Find True edit-find @@ -500,7 +467,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit True False - False @@ -515,7 +481,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. inherit True False - False inherit @@ -699,7 +664,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True True False - False True True @@ -717,7 +681,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True True False - False True @@ -735,7 +698,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True True False - False True @@ -753,7 +715,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. False True False - False True True @@ -772,7 +733,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. False True False - False True @@ -791,7 +751,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True True False - False True @@ -808,7 +767,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True True False - False True True @@ -826,7 +784,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True True False - False True True radiobutton1 @@ -846,7 +803,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True True False - False True True radiobutton1 @@ -866,7 +822,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. False True False - False True True @@ -885,7 +840,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. False True False - False True True radiobutton3 @@ -906,7 +860,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True True False - False True True radiobutton3 @@ -986,7 +939,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True True True - False False @@ -1002,7 +954,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. False True True - False False @@ -1017,7 +968,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True True True - False True @@ -1034,7 +984,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. False True True - False True @@ -1090,7 +1039,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True True True - False False @@ -1104,8 +1052,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True True True - False - #31316867a09f + #31316867a09f False @@ -1368,7 +1315,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. False vertical - + inherit True False @@ -1380,7 +1327,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True True True - False none http://www.gtk.org diff --git a/testsuite/reftests/inherit-and-initial.ui b/testsuite/reftests/inherit-and-initial.ui index 4175473d02..ede18c7cd7 100644 --- a/testsuite/reftests/inherit-and-initial.ui +++ b/testsuite/reftests/inherit-and-initial.ui @@ -68,7 +68,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True False - False _File True @@ -80,7 +79,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. _New True False - False True @@ -89,7 +87,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. _Open True False - False True @@ -98,7 +95,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. _Save True False - False True @@ -107,7 +103,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. Save _As True False - False True @@ -115,7 +110,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True False - False @@ -123,7 +117,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. _Quit True False - False True @@ -135,7 +128,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True False - False _Edit True @@ -147,7 +139,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. Cu_t True True - False True @@ -156,7 +147,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. _Copy True False - False True @@ -165,7 +155,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. _Paste True False - False True @@ -174,7 +163,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. _Delete True False - False True @@ -183,7 +171,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. Checks & Radios True False - False True @@ -196,7 +183,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True True False - False True @@ -207,7 +193,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True False False - False True @@ -219,7 +204,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True True False - False True @@ -230,7 +214,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True True False - False True @@ -241,7 +224,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True False False - False True @@ -253,7 +235,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True False False - False True @@ -269,7 +250,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True True False - False True @@ -280,7 +260,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True False False - False True @@ -292,7 +271,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True True False - False True @@ -303,7 +281,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True True False - False True @@ -314,7 +291,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True False False - False True @@ -326,7 +302,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True False False - False True @@ -342,7 +317,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True False - False _View True @@ -354,7 +328,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. _Dark theme True False - False True @@ -366,7 +339,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True False - False _Help True @@ -378,7 +350,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. _About True False - False True @@ -404,7 +375,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True False - False Save True document-save @@ -418,7 +388,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True False - False Open True document-open @@ -432,7 +401,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True False - False False @@ -443,7 +411,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True False - False Find True edit-find @@ -457,7 +424,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True False - False @@ -471,7 +437,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True False - False True @@ -641,7 +606,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True True False - False True True @@ -658,7 +622,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True True False - False True @@ -675,7 +638,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True True False - False True @@ -692,7 +654,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. False True False - False True True @@ -710,7 +671,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. False True False - False True @@ -728,7 +688,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True True False - False True @@ -744,7 +703,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True True False - False True True @@ -761,7 +719,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True True False - False True True radiobutton1 @@ -780,7 +737,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True True False - False True True radiobutton1 @@ -799,7 +755,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. False True False - False True True @@ -817,7 +772,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. False True False - False True True radiobutton3 @@ -837,7 +791,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True True False - False True True radiobutton3 @@ -912,7 +865,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True True True - False False @@ -927,7 +879,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. False True True - False False @@ -941,7 +892,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True True True - False True @@ -957,7 +907,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. False True True - False True @@ -1010,7 +959,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True True True - False False @@ -1023,8 +971,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True True True - False - #31316867a09f + #31316867a09f False @@ -1269,7 +1216,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. False vertical - + True False @@ -1279,7 +1226,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. True True True - False none http://www.gtk.org diff --git a/testsuite/reftests/linear-gradient.ref.ui b/testsuite/reftests/linear-gradient.ref.ui index ec77ed2b68..f6a86f82ce 100644 --- a/testsuite/reftests/linear-gradient.ref.ui +++ b/testsuite/reftests/linear-gradient.ref.ui @@ -12,13 +12,11 @@ reference - False 40 30 True True True - False a @@ -29,13 +27,11 @@ - False 40 30 True True True - False b @@ -46,13 +42,11 @@ - False 40 30 True True True - False c @@ -63,13 +57,11 @@ - False 40 30 True True True - False d diff --git a/testsuite/reftests/linear-gradient.ui b/testsuite/reftests/linear-gradient.ui index 7da0ad8c4c..eac661eea3 100644 --- a/testsuite/reftests/linear-gradient.ui +++ b/testsuite/reftests/linear-gradient.ui @@ -11,13 +11,11 @@ vertical - False 40 30 True True True - False a @@ -28,13 +26,11 @@ - False 40 30 True True True - False b @@ -45,13 +41,11 @@ - False 40 30 True True True - False c @@ -62,13 +56,11 @@ - False 40 30 True True True - False d diff --git a/testsuite/reftests/opacity.ref.ui b/testsuite/reftests/opacity.ref.ui index 49c8142189..876d504c46 100644 --- a/testsuite/reftests/opacity.ref.ui +++ b/testsuite/reftests/opacity.ref.ui @@ -23,7 +23,6 @@ True True True - False ref @@ -60,7 +59,6 @@ True True True - False ref diff --git a/testsuite/reftests/opacity.ui b/testsuite/reftests/opacity.ui index b6774c3693..94b5a449a7 100644 --- a/testsuite/reftests/opacity.ui +++ b/testsuite/reftests/opacity.ui @@ -26,7 +26,6 @@ True True True - False False @@ -64,7 +63,6 @@ True True True - False False diff --git a/testsuite/reftests/style-properties-nth-child.ref.ui b/testsuite/reftests/style-properties-nth-child.ref.ui index 2cf5d5fa9f..04c1590bcd 100644 --- a/testsuite/reftests/style-properties-nth-child.ref.ui +++ b/testsuite/reftests/style-properties-nth-child.ref.ui @@ -38,7 +38,6 @@ True - False list-add-symbolic @@ -49,7 +48,6 @@ True - False list-add-symbolic diff --git a/testsuite/reftests/style-properties-nth-child.ui b/testsuite/reftests/style-properties-nth-child.ui index fe6aaed872..3d7c7325bf 100644 --- a/testsuite/reftests/style-properties-nth-child.ui +++ b/testsuite/reftests/style-properties-nth-child.ui @@ -38,7 +38,6 @@ True - False list-add-symbolic @@ -49,7 +48,6 @@ True - False list-add-symbolic