Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
GNOME
gtk
Commits
b763bb05
Commit
b763bb05
authored
Feb 10, 2015
by
Benjamin Otte
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
stylecontext: Don't use cache when unsaved
Fixes image-load-from-file reftest
parent
9e96461a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
8 deletions
+15
-8
gtk/gtkstylecontext.c
gtk/gtkstylecontext.c
+15
-8
No files found.
gtk/gtkstylecontext.c
View file @
b763bb05
...
...
@@ -883,17 +883,24 @@ gtk_style_context_lookup_style (GtkStyleContext *context)
if
(
cssnode
->
values
)
return
cssnode
->
values
;
values
=
g_hash_table_lookup
(
priv
->
style_values
,
cssnode
->
decl
);
if
(
values
)
if
(
!
gtk_style_context_is_saved
(
context
))
{
gtk_css_node_set_values
(
cssnode
,
values
);
return
values
;
values
=
build_properties
(
context
,
cssnode
->
decl
,
TRUE
,
gtk_css_node_get_parent_style
(
context
,
cssnode
));
}
else
{
values
=
g_hash_table_lookup
(
priv
->
style_values
,
cssnode
->
decl
);
if
(
values
)
{
gtk_css_node_set_values
(
cssnode
,
values
);
return
values
;
}
values
=
build_properties
(
context
,
cssnode
->
decl
,
FALSE
,
gtk_css_node_get_parent_style
(
context
,
cssnode
));
g_hash_table_insert
(
priv
->
style_values
,
gtk_css_node_declaration_ref
(
cssnode
->
decl
),
g_object_ref
(
values
));
values
=
build_properties
(
context
,
cssnode
->
decl
,
FALSE
,
gtk_css_node_get_parent_style
(
context
,
cssnode
));
g_hash_table_insert
(
priv
->
style_values
,
gtk_css_node_declaration_ref
(
cssnode
->
decl
),
g_object_ref
(
values
));
}
gtk_css_node_set_values
(
cssnode
,
values
);
g_object_unref
(
values
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment