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

Fix clutter build.

Browse Source
This commit is contained in:
Daiki Ueno
2011-02-24 10:29:17 +09:00
parent 9a6b3b3e2d
commit 7ef245d739
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
eek/eek-clutter-renderer.c
View File

@ -111,15 +111,19 @@ eek_clutter_renderer_render_key (EekClutterRenderer *renderer,
PangoRectangle extents = { 0, }; PangoRectangle extents = { 0, };
CoglColor color = { 0x00, 0x00, 0x00, 0xFF }; CoglColor color = { 0x00, 0x00, 0x00, 0xFF };
ClutterGeometry geom; ClutterGeometry geom;
gulong oref;
EekKeyboard *keyboard;
g_assert (EEK_IS_CLUTTER_RENDERER(renderer)); g_assert (EEK_IS_CLUTTER_RENDERER(renderer));
g_assert (CLUTTER_IS_ACTOR(actor)); g_assert (CLUTTER_IS_ACTOR(actor));
g_assert (EEK_IS_KEY(key)); g_assert (EEK_IS_KEY(key));
oref = eek_key_get_oref (key);
g_object_get (renderer, "keyboard", &keyboard, NULL);
outline = eek_keyboard_get_outline (keyboard, oref);
g_object_unref (keyboard);
priv = EEK_CLUTTER_RENDERER_GET_PRIVATE(renderer); priv = EEK_CLUTTER_RENDERER_GET_PRIVATE(renderer);
outline = eek_key_get_outline (key);
outline_texture = g_hash_table_lookup (priv->outline_texture_cache, outline_texture = g_hash_table_lookup (priv->outline_texture_cache,
outline); outline);
if (!outline_texture) { if (!outline_texture) {

2
src/server-context.c
View File

@ -188,7 +188,7 @@ update_widget (ServerContext *context)
#if HAVE_CLUTTER_GTK #if HAVE_CLUTTER_GTK
context->widget = gtk_clutter_embed_new (); context->widget = gtk_clutter_embed_new ();
stage = gtk_clutter_embed_get_stage (GTK_CLUTTER_EMBED(context->widget)); stage = gtk_clutter_embed_get_stage (GTK_CLUTTER_EMBED(context->widget));
actor = eek_clutter_context_new (context->keyboard); actor = eek_clutter_keyboard_new (context->keyboard);
clutter_container_add_actor (CLUTTER_CONTAINER(stage), actor); clutter_container_add_actor (CLUTTER_CONTAINER(stage), actor);
clutter_stage_set_color (CLUTTER_STAGE(stage), &stage_color); clutter_stage_set_color (CLUTTER_STAGE(stage), &stage_color);