callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cssstyle: Add gtk_css_style_is_static()

Browse Source 
Gets rid of the need to do

  if (ANIMATED_STYLE() &&
      animated_style_is_static(ANIMATED_STYLE(style))
This commit is contained in:
Benjamin Otte
2015-02-27 18:41:13 +01:00
parent d9727290cf
commit 759d8dafd9
5 changed files with 37 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtkcssnode.c
View File

@ -271,8 +271,7 @@ gtk_css_node_real_update_style (GtkCssNode *cssnode,
new_style = g_object_ref (style);
}
if (GTK_IS_CSS_ANIMATED_STYLE (new_style) &&
!gtk_css_animated_style_is_static (GTK_CSS_ANIMATED_STYLE (new_style)))
if (!gtk_css_style_is_static (new_style))
gtk_css_node_set_invalid (cssnode, TRUE);
g_object_unref (new_static_style);
@ -901,8 +900,7 @@ gtk_css_node_validate_internal (GtkCssNode *cssnode,
/* need to set to FALSE then to TRUE here to make it chain up */
gtk_css_node_set_invalid (cssnode, FALSE);
if (GTK_IS_CSS_ANIMATED_STYLE (cssnode->style) &&
!gtk_css_animated_style_is_static (GTK_CSS_ANIMATED_STYLE (cssnode->style)))
if (!gtk_css_style_is_static (cssnode->style))
gtk_css_node_set_invalid (cssnode, TRUE);
GTK_CSS_NODE_GET_CLASS (cssnode)->validate (cssnode);