AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-17 15:40:12 +00:00
Code Issues Projects Releases Wiki Activity

cssnodedeclaration: Add possibility to set the name

Browse Source 
This is supposed to be a replacement for setting the type. So far, both
options are possible - either will unset the other.
This commit is contained in:
Benjamin Otte 2015-09-04 19:38:50 +02:00
parent b65f400d56
commit 26450a661e
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
gtk/gtkcssnodedeclaration.c
View File

@ -33,6 +33,7 @@ struct _GtkCssNodeDeclaration {
guint refcount; guint refcount;
GtkJunctionSides junction_sides; GtkJunctionSides junction_sides;
GType type; GType type;
const /* interned */ char *name;
const /* interned */ char *id; const /* interned */ char *id;
GtkStateFlags state; GtkStateFlags state;
guint n_classes; guint n_classes;
@ -118,6 +119,9 @@ gtk_css_node_declaration_new (void)
1, /* need to own a ref ourselves so the copy-on-write path kicks in when people change things */ 1, /* need to own a ref ourselves so the copy-on-write path kicks in when people change things */
0, 0,
0, 0,
NULL,
NULL,
0,
0, 0,
0 0
}; };
@ -166,10 +170,12 @@ gboolean
gtk_css_node_declaration_set_type (GtkCssNodeDeclaration **decl, gtk_css_node_declaration_set_type (GtkCssNodeDeclaration **decl,
GType type) GType type)
{ {
if ((*decl)->type == type) if ((*decl)->type == type &&
(*decl)->name == NULL)
return FALSE; return FALSE;
gtk_css_node_declaration_make_writable (decl); gtk_css_node_declaration_make_writable (decl);
(*decl)->name = NULL;
(*decl)->type = type; (*decl)->type = type;
return TRUE; return TRUE;
@ -181,6 +187,27 @@ gtk_css_node_declaration_get_type (const GtkCssNodeDeclaration *decl)
return decl->type; return decl->type;
} }
gboolean
gtk_css_node_declaration_set_name (GtkCssNodeDeclaration **decl,
/*interned*/ const char *name)
{
if ((*decl)->type == 0 &&
(*decl)->name == name)
return FALSE;
gtk_css_node_declaration_make_writable (decl);
(*decl)->type = 0;
(*decl)->name = name;
return TRUE;
}
/*interned*/ const char *
gtk_css_node_declaration_get_name (const GtkCssNodeDeclaration *decl)
{
return decl->name;
}
gboolean gboolean
gtk_css_node_declaration_set_id (GtkCssNodeDeclaration **decl, gtk_css_node_declaration_set_id (GtkCssNodeDeclaration **decl,
const char *id) const char *id)
@ -510,6 +537,7 @@ gtk_css_node_declaration_hash (gconstpointer elem)
guint hash, i; guint hash, i;
hash = (guint) decl->type; hash = (guint) decl->type;
hash ^= GPOINTER_TO_UINT (decl->name);
hash <<= 5; hash <<= 5;
hash ^= GPOINTER_TO_UINT (decl->id); hash ^= GPOINTER_TO_UINT (decl->id);
@ -550,6 +578,9 @@ gtk_css_node_declaration_equal (gconstpointer elem1,
if (decl1->type != decl2->type) if (decl1->type != decl2->type)
return FALSE; return FALSE;
if (decl1->name != decl2->name)
return FALSE;
if (decl1->state != decl2->state) if (decl1->state != decl2->state)
return FALSE; return FALSE;

3
gtk/gtkcssnodedeclarationprivate.h
View File

@ -34,6 +34,9 @@ GtkJunctionSides gtk_css_node_declaration_get_junction_sides (const G
gboolean gtk_css_node_declaration_set_type (GtkCssNodeDeclaration **decl, gboolean gtk_css_node_declaration_set_type (GtkCssNodeDeclaration **decl,
GType type); GType type);
GType gtk_css_node_declaration_get_type (const GtkCssNodeDeclaration *decl); GType gtk_css_node_declaration_get_type (const GtkCssNodeDeclaration *decl);
gboolean gtk_css_node_declaration_set_name (GtkCssNodeDeclaration **decl,
/*interned*/ const char *name);
/*interned*/ const char*gtk_css_node_declaration_get_name (const GtkCssNodeDeclaration *decl);
gboolean gtk_css_node_declaration_set_id (GtkCssNodeDeclaration **decl, gboolean gtk_css_node_declaration_set_id (GtkCssNodeDeclaration **decl,
const char *id); const char *id);
const char * gtk_css_node_declaration_get_id (const GtkCssNodeDeclaration *decl); const char * gtk_css_node_declaration_get_id (const GtkCssNodeDeclaration *decl);