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

Merge branch 'gtk-3-24-defaultvalues-ignore-more' into 'gtk-3-24'

Browse Source 
defaultvalue: Ignore more style properties that Adwaita overrides

See merge request GNOME/gtk!253
This commit is contained in:
Matthias Clasen 2018-07-19 20:23:29 +00:00
commit e37e1dfcb0
1 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
testsuite/gtk/defaultvalue.c
View File

@ -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)