mirror of
https://github.com/brl/mutter.git
synced 2024-11-23 00:20:42 -05:00
cairo-texture: Disable :sync-size
The :sync-size property of ClutterTexture should be set to FALSE by default by ClutterCairoTexture. The preferred size of the ClutterCairoTexture is already the size of the internal Cairo surface, and we override the preferred width/height getters to that effect. The :sync-size property is also responsible of changing the size of the Texture actor when changing the texture handle - but since we encourage that to happen during the CairoTexture allocation, we get a queue_relayout() invocation (and a warning) when we change the size of the Cairo image surface. Since GObject doesn't make it easy to override the default value of the :sync-size property in sub-classes, we should simply call the setter function during the ClutterCairoTexture instance initialization. We should also change one of the interactive tests using a CairoTexture to rebuild the contents of the actor in response to an allocation.
This commit is contained in:
parent
72fa820dbd
commit
2d99f77e3b
@ -430,6 +430,14 @@ clutter_cairo_texture_init (ClutterCairoTexture *self)
|
|||||||
* match that format
|
* match that format
|
||||||
*/
|
*/
|
||||||
priv->format = CAIRO_FORMAT_ARGB32;
|
priv->format = CAIRO_FORMAT_ARGB32;
|
||||||
|
|
||||||
|
/* the Cairo surface is responsible for driving the size of
|
||||||
|
* the texture; if we let sync_size to its default of TRUE,
|
||||||
|
* the Texture will try to queue a relayout every time we
|
||||||
|
* change the size of the Cairo surface - which is not what
|
||||||
|
* we want
|
||||||
|
*/
|
||||||
|
clutter_texture_set_sync_size (CLUTTER_TEXTURE (self), FALSE);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -3,12 +3,14 @@
|
|||||||
#include <cairo/cairo.h>
|
#include <cairo/cairo.h>
|
||||||
#include <clutter/clutter.h>
|
#include <clutter/clutter.h>
|
||||||
|
|
||||||
static ClutterActor *
|
static const ClutterColor bg_color = { 0xcc, 0xcc, 0xcc, 0x99 };
|
||||||
make_background (const ClutterColor *color,
|
|
||||||
|
static void
|
||||||
|
update_background (ClutterActor *tex,
|
||||||
|
const ClutterColor *color,
|
||||||
gfloat width,
|
gfloat width,
|
||||||
gfloat height)
|
gfloat height)
|
||||||
{
|
{
|
||||||
ClutterActor *tex = clutter_cairo_texture_new (width, height);
|
|
||||||
cairo_t *cr = clutter_cairo_texture_create (CLUTTER_CAIRO_TEXTURE (tex));
|
cairo_t *cr = clutter_cairo_texture_create (CLUTTER_CAIRO_TEXTURE (tex));
|
||||||
cairo_pattern_t *pat;
|
cairo_pattern_t *pat;
|
||||||
gfloat x, y;
|
gfloat x, y;
|
||||||
@ -62,8 +64,6 @@ make_background (const ClutterColor *color,
|
|||||||
cairo_destroy (cr);
|
cairo_destroy (cr);
|
||||||
|
|
||||||
#undef BG_ROUND_RADIUS
|
#undef BG_ROUND_RADIUS
|
||||||
|
|
||||||
return tex;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static gboolean
|
static gboolean
|
||||||
@ -90,14 +90,51 @@ on_box_leave (ClutterActor *box,
|
|||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
on_rect_clicked (ClutterClickAction *action,
|
||||||
|
ClutterActor *rect,
|
||||||
|
ClutterActor *box)
|
||||||
|
{
|
||||||
|
static gboolean is_expanded = FALSE;
|
||||||
|
|
||||||
|
if (!is_expanded)
|
||||||
|
clutter_actor_animate (box, CLUTTER_EASE_OUT_BOUNCE, 250,
|
||||||
|
"width", 400.0,
|
||||||
|
"height", 400.0,
|
||||||
|
NULL);
|
||||||
|
else
|
||||||
|
clutter_actor_animate (box, CLUTTER_EASE_OUT_BOUNCE, 250,
|
||||||
|
"width", 200.0,
|
||||||
|
"height", 200.0,
|
||||||
|
NULL);
|
||||||
|
|
||||||
|
is_expanded = !is_expanded;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
on_box_allocation_changed (ClutterActor *box,
|
||||||
|
const ClutterActorBox *allocation,
|
||||||
|
ClutterAllocationFlags flags,
|
||||||
|
ClutterActor *background)
|
||||||
|
{
|
||||||
|
gfloat new_width, new_height;
|
||||||
|
|
||||||
|
clutter_actor_box_get_size (allocation, &new_width, &new_height);
|
||||||
|
clutter_cairo_texture_set_surface_size (CLUTTER_CAIRO_TEXTURE (background),
|
||||||
|
new_width,
|
||||||
|
new_height);
|
||||||
|
|
||||||
|
update_background (background, &bg_color, new_width, new_height);
|
||||||
|
}
|
||||||
|
|
||||||
G_MODULE_EXPORT int
|
G_MODULE_EXPORT int
|
||||||
test_bin_layout_main (int argc, char *argv[])
|
test_bin_layout_main (int argc, char *argv[])
|
||||||
{
|
{
|
||||||
ClutterActor *stage, *box, *rect;
|
ClutterActor *stage, *box, *rect;
|
||||||
ClutterLayoutManager *layout;
|
ClutterLayoutManager *layout;
|
||||||
ClutterColor stage_color = { 0xe0, 0xf2, 0xfc, 0xff };
|
ClutterColor stage_color = { 0xe0, 0xf2, 0xfc, 0xff };
|
||||||
ClutterColor bg_color = { 0xcc, 0xcc, 0xcc, 0x99 };
|
|
||||||
ClutterColor *color;
|
ClutterColor *color;
|
||||||
|
ClutterAction *action;
|
||||||
|
|
||||||
clutter_init (&argc, &argv);
|
clutter_init (&argc, &argv);
|
||||||
|
|
||||||
@ -116,7 +153,11 @@ test_bin_layout_main (int argc, char *argv[])
|
|||||||
clutter_actor_set_reactive (box, TRUE);
|
clutter_actor_set_reactive (box, TRUE);
|
||||||
clutter_actor_set_name (box, "box");
|
clutter_actor_set_name (box, "box");
|
||||||
|
|
||||||
rect = make_background (&bg_color, 200, 200);
|
/* the contents of the texture are created every time the allocation
|
||||||
|
* of the box changes, to keep the background's size the same as the
|
||||||
|
* box's size
|
||||||
|
*/
|
||||||
|
rect = clutter_cairo_texture_new (100, 100);
|
||||||
|
|
||||||
/* first method: use clutter_box_pack() */
|
/* first method: use clutter_box_pack() */
|
||||||
clutter_box_pack (CLUTTER_BOX (box), rect,
|
clutter_box_pack (CLUTTER_BOX (box), rect,
|
||||||
@ -126,6 +167,9 @@ test_bin_layout_main (int argc, char *argv[])
|
|||||||
|
|
||||||
clutter_actor_lower_bottom (rect);
|
clutter_actor_lower_bottom (rect);
|
||||||
clutter_actor_set_name (rect, "background");
|
clutter_actor_set_name (rect, "background");
|
||||||
|
g_signal_connect (box, "allocation-changed",
|
||||||
|
G_CALLBACK (on_box_allocation_changed),
|
||||||
|
rect);
|
||||||
|
|
||||||
{
|
{
|
||||||
ClutterActor *tex;
|
ClutterActor *tex;
|
||||||
@ -167,9 +211,13 @@ test_bin_layout_main (int argc, char *argv[])
|
|||||||
|
|
||||||
clutter_actor_set_size (rect, 50, 50);
|
clutter_actor_set_size (rect, 50, 50);
|
||||||
clutter_actor_set_opacity (rect, 0);
|
clutter_actor_set_opacity (rect, 0);
|
||||||
|
clutter_actor_set_reactive (rect, TRUE);
|
||||||
clutter_actor_raise_top (rect);
|
clutter_actor_raise_top (rect);
|
||||||
clutter_actor_set_name (rect, "emblem");
|
clutter_actor_set_name (rect, "emblem");
|
||||||
|
|
||||||
|
action = clutter_click_action_new ();
|
||||||
|
clutter_actor_add_action (rect, action);
|
||||||
|
g_signal_connect (action, "clicked", G_CALLBACK (on_rect_clicked), box);
|
||||||
|
|
||||||
g_signal_connect (box,
|
g_signal_connect (box,
|
||||||
"enter-event", G_CALLBACK (on_box_enter),
|
"enter-event", G_CALLBACK (on_box_enter),
|
||||||
|
Loading…
Reference in New Issue
Block a user