brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

st/test-theme: Rename theme context variable

Browse Source 
We will later get a pointer to a MetaContext, so avoid that future
naming conflict.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1840>
This commit is contained in:
Jonas Ådahl 2021-05-06 23:16:31 +02:00 committed by Marge Bot
parent 7f7b515b84
commit 4340170e94
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/st/test-theme.c
View File

@ -540,7 +540,7 @@ main (int argc, char **argv)
{ {
MetaBackend *backend; MetaBackend *backend;
StTheme *theme; StTheme *theme;
StThemeContext *context; StThemeContext *theme_context;
PangoFontDescription *font_desc; PangoFontDescription *font_desc;
GFile *file; GFile *file;
g_autofree char *cwd = NULL; g_autofree char *cwd = NULL;
@ -564,36 +564,36 @@ main (int argc, char **argv)
backend = meta_get_backend (); backend = meta_get_backend ();
stage = meta_backend_get_stage (backend); stage = meta_backend_get_stage (backend);
context = st_theme_context_get_for_stage (CLUTTER_STAGE (stage)); theme_context = st_theme_context_get_for_stage (CLUTTER_STAGE (stage));
st_theme_context_set_theme (context, theme); st_theme_context_set_theme (theme_context, theme);
font_desc = pango_font_description_from_string ("sans-serif 12"); font_desc = pango_font_description_from_string ("sans-serif 12");
st_theme_context_set_font (context, font_desc); st_theme_context_set_font (theme_context, font_desc);
pango_font_description_free (font_desc); pango_font_description_free (font_desc);
root = st_theme_context_get_root_node (context); root = st_theme_context_get_root_node (theme_context);
group1 = st_theme_node_new (context, root, NULL, group1 = st_theme_node_new (theme_context, root, NULL,
CLUTTER_TYPE_ACTOR, "group1", NULL, NULL, NULL); CLUTTER_TYPE_ACTOR, "group1", NULL, NULL, NULL);
text1 = st_theme_node_new (context, group1, NULL, text1 = st_theme_node_new (theme_context, group1, NULL,
CLUTTER_TYPE_TEXT, "text1", "special-text", NULL, NULL); CLUTTER_TYPE_TEXT, "text1", "special-text", NULL, NULL);
text2 = st_theme_node_new (context, group1, NULL, text2 = st_theme_node_new (theme_context, group1, NULL,
CLUTTER_TYPE_TEXT, "text2", NULL, NULL, NULL); CLUTTER_TYPE_TEXT, "text2", NULL, NULL, NULL);
group2 = st_theme_node_new (context, root, NULL, group2 = st_theme_node_new (theme_context, root, NULL,
CLUTTER_TYPE_ACTOR, "group2", NULL, NULL, NULL); CLUTTER_TYPE_ACTOR, "group2", NULL, NULL, NULL);
group4 = st_theme_node_new (context, root, NULL, group4 = st_theme_node_new (theme_context, root, NULL,
CLUTTER_TYPE_ACTOR, "group4", NULL, NULL, NULL); CLUTTER_TYPE_ACTOR, "group4", NULL, NULL, NULL);
group5 = st_theme_node_new (context, root, NULL, group5 = st_theme_node_new (theme_context, root, NULL,
CLUTTER_TYPE_ACTOR, "group5", NULL, NULL, NULL); CLUTTER_TYPE_ACTOR, "group5", NULL, NULL, NULL);
group6 = st_theme_node_new (context, root, NULL, group6 = st_theme_node_new (theme_context, root, NULL,
CLUTTER_TYPE_ACTOR, "group6", NULL, NULL, NULL); CLUTTER_TYPE_ACTOR, "group6", NULL, NULL, NULL);
text3 = st_theme_node_new (context, group2, NULL, text3 = st_theme_node_new (theme_context, group2, NULL,
CLUTTER_TYPE_TEXT, "text3", NULL, NULL, CLUTTER_TYPE_TEXT, "text3", NULL, NULL,
"color: #0000ff; padding-bottom: 12px;"); "color: #0000ff; padding-bottom: 12px;");
text4 = st_theme_node_new (context, group2, NULL, text4 = st_theme_node_new (theme_context, group2, NULL,
CLUTTER_TYPE_TEXT, "text4", NULL, "visited hover", NULL); CLUTTER_TYPE_TEXT, "text4", NULL, "visited hover", NULL);
group3 = st_theme_node_new (context, group2, NULL, group3 = st_theme_node_new (theme_context, group2, NULL,
CLUTTER_TYPE_ACTOR, "group3", NULL, "hover", NULL); CLUTTER_TYPE_ACTOR, "group3", NULL, "hover", NULL);
button = st_theme_node_new (context, root, NULL, button = st_theme_node_new (theme_context, root, NULL,
ST_TYPE_BUTTON, "button", NULL, NULL, NULL); ST_TYPE_BUTTON, "button", NULL, NULL, NULL);
test_defaults (); test_defaults ();