s3rius/squeekboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use g_object_set_qdata() to attach theme-node to element.

Browse Source
This commit is contained in:
Daiki Ueno
2011-03-07 10:42:27 +09:00
parent e20425f385
commit 1db2a4aeea
1 changed files with 45 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
eek/eek-renderer.c
View File

@ -59,8 +59,6 @@ struct _EekRendererPrivate
gulong symbol_index_changed_handler; gulong symbol_index_changed_handler;
EekTheme *theme; EekTheme *theme;
/* a mapping from EekElement to EekThemeNode */
GHashTable *theme_node_hash;
}; };
struct { struct {
@ -714,7 +712,6 @@ eek_renderer_finalize (GObject *object)
eek_color_free (priv->default_foreground); eek_color_free (priv->default_foreground);
eek_color_free (priv->default_background); eek_color_free (priv->default_background);
pango_font_description_free (priv->font); pango_font_description_free (priv->font);
g_hash_table_destroy (priv->theme_node_hash);
G_OBJECT_CLASS (eek_renderer_parent_class)->finalize (object); G_OBJECT_CLASS (eek_renderer_parent_class)->finalize (object);
} }
@ -778,11 +775,6 @@ eek_renderer_init (EekRenderer *self)
(GDestroyNotify)cairo_surface_destroy); (GDestroyNotify)cairo_surface_destroy);
priv->keyboard_surface = NULL; priv->keyboard_surface = NULL;
priv->symbol_index_changed_handler = 0; priv->symbol_index_changed_handler = 0;
priv->theme_node_hash =
g_hash_table_new_full (g_direct_hash,
g_direct_equal,
NULL,
(GDestroyNotify)g_object_unref);
} }
static void static void
@ -1073,7 +1065,8 @@ eek_renderer_get_foreground_color (EekRenderer *renderer, EekElement *element)
priv = EEK_RENDERER_GET_PRIVATE(renderer); priv = EEK_RENDERER_GET_PRIVATE(renderer);
theme_node = g_hash_table_lookup (priv->theme_node_hash, element); theme_node = g_object_get_qdata (G_OBJECT(element),
g_quark_from_static_string ("theme-node"));
if (theme_node) { if (theme_node) {
EekColor *color = eek_theme_node_get_foreground_color (theme_node); EekColor *color = eek_theme_node_get_foreground_color (theme_node);
if (color) if (color)
@ -1093,7 +1086,8 @@ eek_renderer_get_background_color (EekRenderer *renderer, EekElement *element)
priv = EEK_RENDERER_GET_PRIVATE(renderer); priv = EEK_RENDERER_GET_PRIVATE(renderer);
theme_node = g_hash_table_lookup (priv->theme_node_hash, element); theme_node = g_object_get_qdata (G_OBJECT(element),
g_quark_from_static_string ("theme-node"));
if (theme_node) { if (theme_node) {
EekColor *color = eek_theme_node_get_background_color (theme_node); EekColor *color = eek_theme_node_get_background_color (theme_node);
if (color) if (color)
@ -1113,7 +1107,8 @@ eek_renderer_get_background_gradient (EekRenderer *renderer, EekElement *element
priv = EEK_RENDERER_GET_PRIVATE(renderer); priv = EEK_RENDERER_GET_PRIVATE(renderer);
theme_node = g_hash_table_lookup (priv->theme_node_hash, element); theme_node = g_object_get_qdata (G_OBJECT(element),
g_quark_from_static_string ("theme-node"));
if (theme_node) if (theme_node)
return eek_theme_node_get_background_gradient (theme_node); return eek_theme_node_get_background_gradient (theme_node);
@ -1258,18 +1253,21 @@ create_theme_node_key_callback (EekElement *element,
{ {
CreateThemeNodeData *data = user_data; CreateThemeNodeData *data = user_data;
EekRendererPrivate *priv; EekRendererPrivate *priv;
EekThemeNode *node; EekThemeNode *theme_node;
priv = EEK_RENDERER_GET_PRIVATE(data->renderer); priv = EEK_RENDERER_GET_PRIVATE(data->renderer);
node = eek_theme_node_new (data->parent, theme_node = eek_theme_node_new (data->parent,
priv->theme, priv->theme,
EEK_TYPE_KEY, EEK_TYPE_KEY,
eek_element_get_name (element), eek_element_get_name (element),
"key", "key",
NULL, NULL,
NULL); NULL);
g_hash_table_insert (priv->theme_node_hash, element, node); g_object_set_qdata_full (G_OBJECT(element),
g_quark_from_static_string ("theme-node"),
theme_node,
(GDestroyNotify)g_object_unref);
} }
void void
@ -1278,21 +1276,24 @@ create_theme_node_section_callback (EekElement *element,
{ {
CreateThemeNodeData *data = user_data; CreateThemeNodeData *data = user_data;
EekRendererPrivate *priv; EekRendererPrivate *priv;
EekThemeNode *node, *parent; EekThemeNode *theme_node, *parent;
priv = EEK_RENDERER_GET_PRIVATE(data->renderer); priv = EEK_RENDERER_GET_PRIVATE(data->renderer);
node = eek_theme_node_new (data->parent, theme_node = eek_theme_node_new (data->parent,
priv->theme, priv->theme,
EEK_TYPE_SECTION, EEK_TYPE_SECTION,
eek_element_get_name (element), eek_element_get_name (element),
"section", "section",
NULL, NULL,
NULL); NULL);
g_hash_table_insert (priv->theme_node_hash, element, node); g_object_set_qdata_full (G_OBJECT(element),
g_quark_from_static_string ("theme-node"),
theme_node,
(GDestroyNotify)g_object_unref);
parent = data->parent; parent = data->parent;
data->parent = node; data->parent = theme_node;
eek_container_foreach_child (EEK_CONTAINER(element), eek_container_foreach_child (EEK_CONTAINER(element),
create_theme_node_key_callback, create_theme_node_key_callback,
data); data);
@ -1304,30 +1305,32 @@ eek_renderer_set_theme (EekRenderer *renderer,
EekTheme *theme) EekTheme *theme)
{ {
EekRendererPrivate *priv; EekRendererPrivate *priv;
EekThemeNode *node; EekThemeNode *theme_node;
CreateThemeNodeData data; CreateThemeNodeData data;
g_assert (EEK_IS_RENDERER(renderer)); g_assert (EEK_IS_RENDERER(renderer));
g_assert (EEK_IS_THEME(theme)); g_assert (EEK_IS_THEME(theme));
priv = EEK_RENDERER_GET_PRIVATE(renderer); priv = EEK_RENDERER_GET_PRIVATE(renderer);
g_assert (priv->keyboard);
if (priv->theme) if (priv->theme)
g_object_unref (priv->theme); g_object_unref (priv->theme);
priv->theme = g_object_ref (theme); priv->theme = g_object_ref (theme);
g_hash_table_remove_all (priv->theme_node_hash); theme_node = eek_theme_node_new (NULL,
node = eek_theme_node_new (NULL,
priv->theme, priv->theme,
EEK_TYPE_KEYBOARD, EEK_TYPE_KEYBOARD,
"keyboard", "keyboard",
"keyboard", "keyboard",
NULL, NULL,
NULL); NULL);
g_hash_table_insert (priv->theme_node_hash, priv->keyboard, node); g_object_set_qdata_full (G_OBJECT(priv->keyboard),
g_quark_from_static_string ("theme-node"),
theme_node,
(GDestroyNotify)g_object_unref);
data.parent = node; data.parent = theme_node;
data.renderer = renderer; data.renderer = renderer;
eek_container_foreach_child (EEK_CONTAINER(priv->keyboard), eek_container_foreach_child (EEK_CONTAINER(priv->keyboard),
create_theme_node_section_callback, create_theme_node_section_callback,