From 2e5307daea1278f5bdda2a7c04e27d526dcb3f05 Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Thu, 19 Jul 2018 15:45:48 +0100 Subject: [PATCH] defaultvalue: Ignore more style properties that Adwaita overrides These broke once we switched away from Raleigh --- testsuite/gtk/defaultvalue.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/testsuite/gtk/defaultvalue.c b/testsuite/gtk/defaultvalue.c index b2a624f2a0..d3afbb391a 100644 --- a/testsuite/gtk/defaultvalue.c +++ b/testsuite/gtk/defaultvalue.c @@ -398,6 +398,34 @@ G_GNUC_END_IGNORE_DEPRECATIONS strcmp (pspec->name, "button-spacing") == 0)) continue; + if (g_type_is_a (type, GTK_TYPE_SCROLLBAR) && + (strcmp (pspec->name, "has-backward-stepper") == 0 || + strcmp (pspec->name, "has-forward-stepper") == 0)) + continue; + + if (g_type_is_a (type, GTK_TYPE_SCROLLED_WINDOW) && + strcmp (pspec->name, "scrollbar-spacing") == 0) + continue; + + if (g_type_is_a (type, GTK_TYPE_TEXT_VIEW) && + strcmp (pspec->name, "error-underline-color") == 0) + continue; + + if (g_type_is_a (type, GTK_TYPE_TOOL_BUTTON) && + strcmp (pspec->name, "icon-spacing") == 0) + continue; + + if (g_type_is_a (type, GTK_TYPE_TOOL_ITEM_GROUP) && + strcmp (pspec->name, "expander-size") == 0) + continue; + + if (g_type_is_a (type, GTK_TYPE_TREE_VIEW) && + (strcmp (pspec->name, "expander-size") == 0 || + strcmp (pspec->name, "grid-line-pattern") == 0 || + strcmp (pspec->name, "horizontal-separator") == 0 || + strcmp (pspec->name, "tree-line-pattern") == 0)) + continue; + /* This is desktop-dependent */ if (g_type_is_a (type, GTK_TYPE_WINDOW) && strcmp (pspec->name, "decoration-button-layout") == 0)