clutter/stage: Remove unused title property
It was used for the titlebar title, which is no longer relavant in current Clutter Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3989>
This commit is contained in:
parent
2dc2ab94d3
commit
a80360ad38
@ -23,9 +23,6 @@ struct _ClutterStageWindowInterface
|
||||
/*< private >*/
|
||||
GTypeInterface parent_iface;
|
||||
|
||||
void (* set_title) (ClutterStageWindow *stage_window,
|
||||
const gchar *title);
|
||||
|
||||
gboolean (* realize) (ClutterStageWindow *stage_window);
|
||||
void (* unrealize) (ClutterStageWindow *stage_window);
|
||||
|
||||
|
@ -117,7 +117,6 @@ typedef struct _ClutterStagePrivate
|
||||
graphene_matrix_t view;
|
||||
float viewport[4];
|
||||
|
||||
gchar *title;
|
||||
ClutterActor *key_focused_actor;
|
||||
|
||||
ClutterGrab *topmost_grab;
|
||||
@ -147,7 +146,6 @@ enum
|
||||
PROP_0,
|
||||
|
||||
PROP_PERSPECTIVE,
|
||||
PROP_TITLE,
|
||||
PROP_KEY_FOCUS,
|
||||
PROP_IS_GRABBED,
|
||||
|
||||
@ -1235,7 +1233,6 @@ clutter_stage_constructed (GObject *gobject)
|
||||
clutter_stage_queue_actor_relayout (self, CLUTTER_ACTOR (self));
|
||||
|
||||
clutter_actor_set_reactive (CLUTTER_ACTOR (self), TRUE);
|
||||
clutter_stage_set_title (self, g_get_prgname ());
|
||||
clutter_stage_set_key_focus (self, NULL);
|
||||
clutter_stage_set_viewport (self, geom.width, geom.height);
|
||||
|
||||
@ -1262,9 +1259,6 @@ clutter_stage_set_property (GObject *object,
|
||||
|
||||
switch (prop_id)
|
||||
{
|
||||
case PROP_TITLE:
|
||||
clutter_stage_set_title (stage, g_value_get_string (value));
|
||||
break;
|
||||
|
||||
case PROP_KEY_FOCUS:
|
||||
clutter_stage_set_key_focus (stage, g_value_get_object (value));
|
||||
@ -1291,10 +1285,6 @@ clutter_stage_get_property (GObject *gobject,
|
||||
g_value_set_boxed (value, &priv->perspective);
|
||||
break;
|
||||
|
||||
case PROP_TITLE:
|
||||
g_value_set_string (value, priv->title);
|
||||
break;
|
||||
|
||||
case PROP_KEY_FOCUS:
|
||||
g_value_set_object (value, priv->key_focused_actor);
|
||||
break;
|
||||
@ -1369,8 +1359,6 @@ clutter_stage_finalize (GObject *object)
|
||||
g_hash_table_destroy (priv->pointer_devices);
|
||||
g_hash_table_destroy (priv->touch_sequences);
|
||||
|
||||
g_free (priv->title);
|
||||
|
||||
G_OBJECT_CLASS (clutter_stage_parent_class)->finalize (object);
|
||||
}
|
||||
|
||||
@ -1468,18 +1456,6 @@ clutter_stage_class_init (ClutterStageClass *klass)
|
||||
G_PARAM_STATIC_STRINGS |
|
||||
G_PARAM_EXPLICIT_NOTIFY);
|
||||
|
||||
/**
|
||||
* ClutterStage:title:
|
||||
*
|
||||
* The stage's title - usually displayed in stage windows title decorations.
|
||||
*/
|
||||
obj_props[PROP_TITLE] =
|
||||
g_param_spec_string ("title", NULL, NULL,
|
||||
NULL,
|
||||
G_PARAM_READWRITE |
|
||||
G_PARAM_STATIC_STRINGS |
|
||||
G_PARAM_EXPLICIT_NOTIFY);
|
||||
|
||||
/**
|
||||
* ClutterStage:key-focus:
|
||||
*
|
||||
@ -2028,55 +2004,6 @@ clutter_stage_get_actor_at_pos (ClutterStage *stage,
|
||||
return _clutter_stage_do_pick (stage, x, y, pick_mode, NULL);
|
||||
}
|
||||
|
||||
/**
|
||||
* clutter_stage_set_title:
|
||||
* @stage: A #ClutterStage
|
||||
* @title: A utf8 string for the stage windows title.
|
||||
*
|
||||
* Sets the stage title.
|
||||
**/
|
||||
void
|
||||
clutter_stage_set_title (ClutterStage *stage,
|
||||
const gchar *title)
|
||||
{
|
||||
ClutterStagePrivate *priv;
|
||||
ClutterStageWindow *impl;
|
||||
|
||||
g_return_if_fail (CLUTTER_IS_STAGE (stage));
|
||||
|
||||
priv = clutter_stage_get_instance_private (stage);
|
||||
|
||||
g_free (priv->title);
|
||||
priv->title = g_strdup (title);
|
||||
|
||||
impl = CLUTTER_STAGE_WINDOW (priv->impl);
|
||||
if (CLUTTER_STAGE_WINDOW_GET_IFACE(impl)->set_title != NULL)
|
||||
CLUTTER_STAGE_WINDOW_GET_IFACE (impl)->set_title (impl, priv->title);
|
||||
|
||||
g_object_notify_by_pspec (G_OBJECT (stage), obj_props[PROP_TITLE]);
|
||||
}
|
||||
|
||||
/**
|
||||
* clutter_stage_get_title:
|
||||
* @stage: A #ClutterStage
|
||||
*
|
||||
* Gets the stage title.
|
||||
*
|
||||
* Return value: pointer to the title string for the stage. The
|
||||
* returned string is owned by the actor and should not
|
||||
* be modified or freed.
|
||||
**/
|
||||
const gchar *
|
||||
clutter_stage_get_title (ClutterStage *stage)
|
||||
{
|
||||
ClutterStagePrivate *priv;
|
||||
|
||||
g_return_val_if_fail (CLUTTER_IS_STAGE (stage), NULL);
|
||||
|
||||
priv = clutter_stage_get_instance_private (stage);
|
||||
return priv->title;
|
||||
}
|
||||
|
||||
/**
|
||||
* clutter_stage_set_key_focus:
|
||||
* @stage: the #ClutterStage
|
||||
|
@ -135,11 +135,6 @@ GType clutter_perspective_get_type (void) G_GNUC_CONST;
|
||||
CLUTTER_EXPORT
|
||||
void clutter_stage_get_perspective (ClutterStage *stage,
|
||||
ClutterPerspective *perspective);
|
||||
CLUTTER_EXPORT
|
||||
void clutter_stage_set_title (ClutterStage *stage,
|
||||
const gchar *title);
|
||||
CLUTTER_EXPORT
|
||||
const gchar * clutter_stage_get_title (ClutterStage *stage);
|
||||
|
||||
CLUTTER_EXPORT
|
||||
void clutter_stage_set_minimum_size (ClutterStage *stage,
|
||||
|
@ -226,27 +226,19 @@ set_wm_title (MetaStageX11 *stage_x11)
|
||||
MetaClutterBackendX11 *clutter_backend_x11 =
|
||||
clutter_backend_x11_from_stage (stage_x11);
|
||||
Display *xdisplay = xdisplay_from_stage (stage_x11);
|
||||
const char *title = g_get_prgname ();
|
||||
|
||||
if (stage_x11->xwin == None)
|
||||
if (stage_x11->xwin == None || title == NULL)
|
||||
return;
|
||||
|
||||
if (stage_x11->title == NULL)
|
||||
{
|
||||
XDeleteProperty (xdisplay,
|
||||
stage_x11->xwin,
|
||||
clutter_backend_x11->atom_NET_WM_NAME);
|
||||
}
|
||||
else
|
||||
{
|
||||
XChangeProperty (xdisplay,
|
||||
stage_x11->xwin,
|
||||
clutter_backend_x11->atom_NET_WM_NAME,
|
||||
clutter_backend_x11->atom_UTF8_STRING,
|
||||
8,
|
||||
PropModeReplace,
|
||||
(unsigned char *) stage_x11->title,
|
||||
(int) strlen (stage_x11->title));
|
||||
}
|
||||
XChangeProperty (xdisplay,
|
||||
stage_x11->xwin,
|
||||
clutter_backend_x11->atom_NET_WM_NAME,
|
||||
clutter_backend_x11->atom_UTF8_STRING,
|
||||
8,
|
||||
PropModeReplace,
|
||||
(unsigned char *) title,
|
||||
(int) strlen (title));
|
||||
}
|
||||
|
||||
static void
|
||||
@ -385,17 +377,6 @@ meta_stage_x11_realize (ClutterStageWindow *stage_window)
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static void
|
||||
meta_stage_x11_set_title (ClutterStageWindow *stage_window,
|
||||
const char *title)
|
||||
{
|
||||
MetaStageX11 *stage_x11 = META_STAGE_X11 (stage_window);
|
||||
|
||||
g_free (stage_x11->title);
|
||||
stage_x11->title = g_strdup (title);
|
||||
set_wm_title (stage_x11);
|
||||
}
|
||||
|
||||
static inline void
|
||||
update_wm_hints (MetaStageX11 *stage_x11)
|
||||
{
|
||||
@ -513,22 +494,9 @@ meta_stage_x11_redraw_view (ClutterStageWindow *stage_window,
|
||||
clutter_frame_set_result (frame, CLUTTER_FRAME_RESULT_PENDING_PRESENTED);
|
||||
}
|
||||
|
||||
static void
|
||||
meta_stage_x11_finalize (GObject *object)
|
||||
{
|
||||
MetaStageX11 *stage_x11 = META_STAGE_X11 (object);
|
||||
|
||||
g_free (stage_x11->title);
|
||||
|
||||
G_OBJECT_CLASS (meta_stage_x11_parent_class)->finalize (object);
|
||||
}
|
||||
|
||||
static void
|
||||
meta_stage_x11_class_init (MetaStageX11Class *klass)
|
||||
{
|
||||
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
|
||||
|
||||
gobject_class->finalize = meta_stage_x11_finalize;
|
||||
}
|
||||
|
||||
static void
|
||||
@ -539,8 +507,6 @@ meta_stage_x11_init (MetaStageX11 *stage)
|
||||
stage->xwin_height = 480;
|
||||
|
||||
stage->wm_state = STAGE_X11_WITHDRAWN;
|
||||
|
||||
stage->title = NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
@ -548,7 +514,6 @@ clutter_stage_window_iface_init (ClutterStageWindowInterface *iface)
|
||||
{
|
||||
clutter_stage_window_parent_iface = g_type_interface_peek_parent (iface);
|
||||
|
||||
iface->set_title = meta_stage_x11_set_title;
|
||||
iface->show = meta_stage_x11_show;
|
||||
iface->hide = meta_stage_x11_hide;
|
||||
iface->resize = meta_stage_x11_resize;
|
||||
|
@ -58,8 +58,6 @@ struct _MetaStageX11
|
||||
|
||||
CoglFrameClosure *frame_closure;
|
||||
|
||||
gchar *title;
|
||||
|
||||
guint clipped_redraws_cool_off;
|
||||
|
||||
MetaStageX11State wm_state;
|
||||
|
@ -42,7 +42,6 @@ main (int argc, char *argv[])
|
||||
|
||||
stage = clutter_test_get_stage ();
|
||||
|
||||
clutter_stage_set_title (CLUTTER_STAGE (stage), "Cally - AtkComponent Test");
|
||||
clutter_actor_set_background_color (CLUTTER_ACTOR (stage),
|
||||
&COGL_COLOR_INIT (255, 255, 255, 255));
|
||||
clutter_actor_set_size (stage, WIDTH, HEIGHT);
|
||||
|
@ -167,7 +167,6 @@ make_ui (ClutterActor *stage)
|
||||
{
|
||||
ClutterActor *button = NULL;
|
||||
|
||||
clutter_stage_set_title (CLUTTER_STAGE (stage), "Cally - AtkEditable Test");
|
||||
clutter_actor_set_background_color (CLUTTER_ACTOR (stage),
|
||||
&COGL_COLOR_INIT (255, 255, 255, 255));
|
||||
clutter_actor_set_size (stage, WIDTH, HEIGHT);
|
||||
|
@ -170,14 +170,12 @@ main (int argc, char *argv[])
|
||||
atk_add_global_event_listener (window_event_listener, "Atk:AtkWindow:deactivate");
|
||||
|
||||
stage_main = clutter_test_get_stage ();
|
||||
clutter_stage_set_title (CLUTTER_STAGE (stage_main), "Cally - AtkEvents/1");
|
||||
g_signal_connect (stage_main, "destroy", G_CALLBACK (clutter_test_quit), NULL);
|
||||
make_ui (stage_main);
|
||||
|
||||
clutter_actor_show (stage_main);
|
||||
|
||||
stage = clutter_test_get_stage ();
|
||||
clutter_stage_set_title (CLUTTER_STAGE (stage), "Cally - AtkEvents/2");
|
||||
g_signal_connect (stage, "destroy", G_CALLBACK (clutter_test_quit), NULL);
|
||||
|
||||
make_ui (stage);
|
||||
|
@ -235,7 +235,6 @@ main (int argc, char *argv[])
|
||||
cally_util_a11y_init (&argc, &argv);
|
||||
|
||||
stage = clutter_test_get_stage ();
|
||||
clutter_stage_set_title (CLUTTER_STAGE (stage), "Cally - AtkText Test");
|
||||
g_signal_connect (stage, "destroy", G_CALLBACK (clutter_test_quit), NULL);
|
||||
|
||||
make_ui (stage);
|
||||
|
@ -97,7 +97,6 @@ main (int argc, char *argv[])
|
||||
cally_util_a11y_init (&argc, &argv);
|
||||
|
||||
stage = clutter_test_get_stage ();
|
||||
clutter_stage_set_title (CLUTTER_STAGE (stage), "Cally - Clone Test");
|
||||
g_signal_connect (stage, "destroy", G_CALLBACK (clutter_test_quit), NULL);
|
||||
|
||||
make_ui (stage);
|
||||
|
@ -159,8 +159,6 @@ test_actors_main (int argc, char *argv[])
|
||||
clutter_actor_set_background_color (oh->stage, &COGL_COLOR_INIT (114, 159, 207, 255));
|
||||
g_signal_connect (oh->stage, "destroy", G_CALLBACK (stop_and_quit), oh);
|
||||
|
||||
clutter_stage_set_title (CLUTTER_STAGE (oh->stage), "Actors");
|
||||
|
||||
/* Create a timeline to manage animation */
|
||||
oh->timeline = clutter_timeline_new_for_actor (oh->stage, 6000);
|
||||
clutter_timeline_set_repeat_count (oh->timeline, -1);
|
||||
|
@ -94,7 +94,6 @@ test_animation_main (int argc, char *argv[])
|
||||
|
||||
stage = clutter_test_get_stage ();
|
||||
clutter_actor_set_background_color (stage, &COGL_COLOR_INIT (114, 159, 207, 255));
|
||||
clutter_stage_set_title (CLUTTER_STAGE (stage), "Animation");
|
||||
g_signal_connect (stage, "destroy", G_CALLBACK (clutter_test_quit), NULL);
|
||||
|
||||
rect = clutter_actor_new ();
|
||||
|
@ -181,7 +181,6 @@ test_bind_constraint_main (int argc, char *argv[])
|
||||
|
||||
stage = clutter_test_get_stage ();
|
||||
g_signal_connect (stage, "destroy", G_CALLBACK (clutter_test_quit), NULL);
|
||||
clutter_stage_set_title (CLUTTER_STAGE (stage), "Constraints");
|
||||
clutter_actor_set_size (stage, 800, 600);
|
||||
|
||||
/* main rectangle */
|
||||
|
@ -261,7 +261,6 @@ test_binding_pool_main (int argc, char *argv[])
|
||||
clutter_test_init (&argc, &argv);
|
||||
|
||||
stage = clutter_test_get_stage ();
|
||||
clutter_stage_set_title (CLUTTER_STAGE (stage), "Key Binding Pool");
|
||||
g_signal_connect (stage,
|
||||
"button-press-event", G_CALLBACK (clutter_test_quit),
|
||||
NULL);
|
||||
|
@ -132,7 +132,6 @@ test_cogl_multitexture_main (int argc, char *argv[])
|
||||
stage = clutter_test_get_stage ();
|
||||
clutter_actor_get_size (stage, &stage_w, &stage_h);
|
||||
|
||||
clutter_stage_set_title (CLUTTER_STAGE (stage), "Cogl: Multi-texturing");
|
||||
clutter_actor_set_background_color (CLUTTER_ACTOR (stage), &stage_color);
|
||||
|
||||
g_signal_connect (stage, "destroy", G_CALLBACK (clutter_test_quit), NULL);
|
||||
|
@ -284,7 +284,6 @@ test_cogl_offscreen_main (int argc, char *argv[])
|
||||
/* Stage */
|
||||
stage = clutter_test_get_stage ();
|
||||
clutter_actor_set_size (stage, 400, 400);
|
||||
clutter_stage_set_title (CLUTTER_STAGE (stage), "Cogl Offscreen Buffers");
|
||||
g_signal_connect (stage, "destroy", G_CALLBACK (clutter_test_quit), NULL);
|
||||
|
||||
/* Cogl Box */
|
||||
|
@ -263,7 +263,6 @@ test_cogl_point_sprites_main (int argc, char *argv[])
|
||||
stage = clutter_test_get_stage ();
|
||||
clutter_actor_set_background_color (CLUTTER_ACTOR (stage),
|
||||
&COGL_COLOR_INIT (0, 0, 0, 255));
|
||||
clutter_stage_set_title (CLUTTER_STAGE (stage), "Cogl Point Sprites");
|
||||
g_signal_connect (stage, "destroy", G_CALLBACK (clutter_test_quit), NULL);
|
||||
g_signal_connect (CLUTTER_STAGE (stage), "after-paint", G_CALLBACK (on_after_paint), &data);
|
||||
|
||||
|
@ -324,7 +324,6 @@ test_cogl_shader_glsl_main (int argc, char *argv[])
|
||||
actor = g_object_new (CLUTTER_TYPE_TEST_ACTOR, NULL);
|
||||
clutter_actor_add_child (stage, actor);
|
||||
|
||||
clutter_stage_set_title (CLUTTER_STAGE (stage), "Assembly Shader Test");
|
||||
clutter_actor_set_background_color (CLUTTER_ACTOR (stage), &stage_color);
|
||||
|
||||
file = g_build_filename (TESTS_DATADIR, "redhand.png", NULL);
|
||||
|
@ -154,7 +154,6 @@ test_cogl_tex_tile_main (int argc, char *argv[])
|
||||
/* Stage */
|
||||
stage = clutter_test_get_stage ();
|
||||
clutter_actor_set_size (stage, 400, 400);
|
||||
clutter_stage_set_title (CLUTTER_STAGE (stage), "Cogl Texture Tiling");
|
||||
g_signal_connect (stage, "destroy", G_CALLBACK (clutter_test_quit), NULL);
|
||||
|
||||
/* Cogl Box */
|
||||
|
@ -182,7 +182,6 @@ test_content_main (int argc, char *argv[])
|
||||
|
||||
stage = clutter_test_get_stage ();
|
||||
clutter_actor_set_name (stage, "Stage");
|
||||
clutter_stage_set_title (CLUTTER_STAGE (stage), "Content");
|
||||
g_signal_connect (stage, "destroy", G_CALLBACK (clutter_test_quit), NULL);
|
||||
clutter_actor_show (stage);
|
||||
|
||||
|
@ -171,7 +171,6 @@ test_devices_main (int argc, char **argv)
|
||||
|
||||
stage = clutter_test_get_stage ();
|
||||
clutter_actor_set_background_color (stage, &COGL_COLOR_INIT (114, 159, 207, 255));
|
||||
clutter_stage_set_title (CLUTTER_STAGE (stage), "Devices");
|
||||
g_signal_connect (stage,
|
||||
"destroy", G_CALLBACK (clutter_test_quit),
|
||||
NULL);
|
||||
|
@ -383,7 +383,6 @@ test_events_main (int argc, char *argv[])
|
||||
clutter_test_init (&argc, &argv);
|
||||
|
||||
stage = clutter_test_get_stage ();
|
||||
clutter_stage_set_title (CLUTTER_STAGE (stage), "Events");
|
||||
clutter_actor_set_name (stage, "Stage");
|
||||
g_signal_connect (stage, "destroy", G_CALLBACK (clutter_test_quit), NULL);
|
||||
g_signal_connect (stage, "event", G_CALLBACK (input_cb), (char *) "stage");
|
||||
|
@ -214,7 +214,6 @@ test_grab_main (int argc, char *argv[])
|
||||
g_print ("Cyan box: toggle grab (from cyan box) for keyboard events.\n\n");
|
||||
|
||||
stage = clutter_test_get_stage ();
|
||||
clutter_stage_set_title (CLUTTER_STAGE (stage), "Grabs");
|
||||
g_signal_connect (stage, "destroy", G_CALLBACK (clutter_test_quit), NULL);
|
||||
g_signal_connect (stage, "event",
|
||||
G_CALLBACK (debug_event_cb), (char *) "stage");
|
||||
|
@ -190,7 +190,6 @@ test_image_main (int argc, char *argv[])
|
||||
|
||||
stage = clutter_test_get_stage ();
|
||||
clutter_actor_set_name (stage, "Stage");
|
||||
clutter_stage_set_title (CLUTTER_STAGE (stage), "Content");
|
||||
g_signal_connect (stage, "destroy", G_CALLBACK (clutter_test_quit), NULL);
|
||||
clutter_actor_show (stage);
|
||||
|
||||
|
@ -45,7 +45,6 @@ test_keyframe_transition_main (int argc, char *argv[])
|
||||
clutter_test_init (&argc, &argv);
|
||||
|
||||
stage = clutter_test_get_stage ();
|
||||
clutter_stage_set_title (CLUTTER_STAGE (stage), "Keyframe Transitions");
|
||||
g_signal_connect (stage, "destroy", G_CALLBACK (clutter_test_quit), NULL);
|
||||
|
||||
for (i = 0; i < 3; i++)
|
||||
|
@ -92,7 +92,7 @@ my_thing_set_property (GObject *gobject,
|
||||
break;
|
||||
}
|
||||
|
||||
/* setting spacing or padding queues a relayout
|
||||
/* setting spacing or padding queues a relayout
|
||||
because they are supposed to change the internal
|
||||
allocation of children */
|
||||
if (needs_relayout)
|
||||
@ -292,9 +292,9 @@ my_thing_allocate (ClutterActor *self,
|
||||
current_y = priv->padding;
|
||||
max_row_height = 0;
|
||||
|
||||
/* The allocation logic here is to horizontally place children
|
||||
* side-by-side and reflow into a new row when we run out of
|
||||
* space
|
||||
/* The allocation logic here is to horizontally place children
|
||||
* side-by-side and reflow into a new row when we run out of
|
||||
* space
|
||||
*/
|
||||
clutter_actor_iter_init (&iter, self);
|
||||
while (clutter_actor_iter_next (&iter, &child))
|
||||
@ -358,8 +358,8 @@ my_thing_allocate (ClutterActor *self,
|
||||
}
|
||||
|
||||
/* Record the maximum child height on current row to know
|
||||
* what's the increment that should be used for the next
|
||||
* row
|
||||
* what's the increment that should be used for the next
|
||||
* row
|
||||
*/
|
||||
if (natural_height > max_row_height)
|
||||
max_row_height = natural_height;
|
||||
@ -441,7 +441,7 @@ toggle_property_value (ClutterActor *actor,
|
||||
}
|
||||
|
||||
static void
|
||||
increase_property_value (ClutterActor *actor,
|
||||
increase_property_value (ClutterActor *actor,
|
||||
const char *property_name)
|
||||
{
|
||||
gfloat value;
|
||||
@ -454,7 +454,7 @@ increase_property_value (ClutterActor *actor,
|
||||
}
|
||||
|
||||
static void
|
||||
decrease_property_value (ClutterActor *actor,
|
||||
decrease_property_value (ClutterActor *actor,
|
||||
const char *property_name)
|
||||
{
|
||||
gfloat value;
|
||||
@ -470,9 +470,9 @@ static ClutterActor *
|
||||
create_item (void)
|
||||
{
|
||||
ClutterActor *clone = clutter_clone_new (icon);
|
||||
|
||||
|
||||
gint32 size = g_random_int_range (MIN_SIZE, MAX_SIZE);
|
||||
|
||||
|
||||
clutter_actor_set_size (clone, size, size);
|
||||
clutter_actor_animate_with_timeline (clone, CLUTTER_EASE_OUT_CUBIC,
|
||||
main_timeline,
|
||||
@ -498,7 +498,7 @@ keypress_cb (ClutterActor *actor,
|
||||
{
|
||||
if (icon != NULL)
|
||||
{
|
||||
ClutterActor *clone = create_item ();
|
||||
ClutterActor *clone = create_item ();
|
||||
|
||||
/* Add one item to container */
|
||||
clutter_actor_add_child (box, clone);
|
||||
@ -597,7 +597,6 @@ test_layout_main (int argc, char *argv[])
|
||||
|
||||
stage = clutter_test_get_stage ();
|
||||
clutter_actor_set_size (stage, 800, 600);
|
||||
clutter_stage_set_title (CLUTTER_STAGE (stage), "Layout");
|
||||
g_signal_connect (stage, "destroy", G_CALLBACK (clutter_test_quit), NULL);
|
||||
|
||||
main_timeline = clutter_timeline_new_for_actor (stage, 2000);
|
||||
@ -631,7 +630,7 @@ test_layout_main (int argc, char *argv[])
|
||||
|
||||
for (i = 1; i < 33; i++)
|
||||
{
|
||||
ClutterActor *clone = create_item ();
|
||||
ClutterActor *clone = create_item ();
|
||||
|
||||
clutter_actor_add_child (box, clone);
|
||||
}
|
||||
|
@ -70,7 +70,6 @@ test_rotate_zoom_main (int argc, char *argv[])
|
||||
/* create a resizable stage */
|
||||
stage = clutter_test_get_stage ();
|
||||
g_signal_connect (stage, "destroy", G_CALLBACK (clutter_test_quit), NULL);
|
||||
clutter_stage_set_title (CLUTTER_STAGE (stage), "Rotate and Zoom actions");
|
||||
clutter_actor_set_size (stage, STAGE_WIDTH, STAGE_HEIGHT);
|
||||
clutter_actor_set_reactive (stage, FALSE);
|
||||
clutter_actor_show (stage);
|
||||
|
@ -22,7 +22,6 @@ test_shader_effects_main (int argc, char *argv[])
|
||||
clutter_test_init (&argc, &argv);
|
||||
|
||||
stage = clutter_test_get_stage ();
|
||||
clutter_stage_set_title (CLUTTER_STAGE (stage), "Rotations");
|
||||
clutter_actor_set_background_color (stage, &COGL_COLOR_INIT (186, 189, 182, 255));
|
||||
g_signal_connect (stage, "destroy", G_CALLBACK (clutter_test_quit), NULL);
|
||||
|
||||
|
@ -37,7 +37,6 @@ test_stage_sizing_main (int argc, char *argv[])
|
||||
clutter_test_init (&argc, &argv);
|
||||
|
||||
stage = clutter_test_get_stage ();
|
||||
clutter_stage_set_title (CLUTTER_STAGE (stage), "Stage Sizing");
|
||||
g_signal_connect (stage, "destroy", G_CALLBACK (clutter_test_quit), NULL);
|
||||
|
||||
box = clutter_actor_new ();
|
||||
|
@ -120,7 +120,6 @@ test_swipe_action_main (int argc, char *argv[])
|
||||
clutter_test_init (&argc, &argv);
|
||||
|
||||
stage = clutter_test_get_stage ();
|
||||
clutter_stage_set_title (CLUTTER_STAGE (stage), "Swipe action");
|
||||
clutter_actor_set_size (stage, 640, 480);
|
||||
g_signal_connect (stage, "destroy", G_CALLBACK (clutter_test_quit), NULL);
|
||||
|
||||
|
@ -260,7 +260,6 @@ test_text_field_main (gint argc,
|
||||
clutter_test_init (&argc, &argv);
|
||||
|
||||
stage = clutter_test_get_stage ();
|
||||
clutter_stage_set_title (CLUTTER_STAGE (stage), "Text Fields");
|
||||
clutter_actor_set_background_color (stage, &COGL_COLOR_INIT (0, 0, 0, 255));
|
||||
g_signal_connect (stage, "destroy", G_CALLBACK (clutter_test_quit), NULL);
|
||||
|
||||
|
@ -32,7 +32,6 @@ test_text_main (gint argc,
|
||||
clutter_test_init (&argc, &argv);
|
||||
|
||||
stage = clutter_test_get_stage ();
|
||||
clutter_stage_set_title (CLUTTER_STAGE (stage), "Text Editing");
|
||||
clutter_actor_set_background_color (stage, &COGL_COLOR_INIT (0, 0, 0, 255));
|
||||
g_signal_connect (stage, "destroy", G_CALLBACK (clutter_test_quit), NULL);
|
||||
|
||||
|
@ -140,7 +140,6 @@ main (int argc, char *argv[])
|
||||
clutter_actor_set_size (stage, STAGE_WIDTH, STAGE_HEIGHT);
|
||||
clutter_actor_set_background_color (CLUTTER_ACTOR (stage),
|
||||
&COGL_COLOR_INIT (255, 255, 255, 255));
|
||||
clutter_stage_set_title (CLUTTER_STAGE (stage), "Cogl Performance Test");
|
||||
|
||||
/* We want continuous redrawing of the stage... */
|
||||
clutter_threads_add_idle (queue_redraw, stage);
|
||||
|
@ -71,7 +71,6 @@ main (int argc, char **argv)
|
||||
clutter_actor_set_size (stage, 512, 512);
|
||||
clutter_actor_set_background_color (CLUTTER_ACTOR (stage),
|
||||
&COGL_COLOR_INIT (0, 0, 0, 255));
|
||||
clutter_stage_set_title (CLUTTER_STAGE (stage), "Picking");
|
||||
|
||||
printf ("Picking performance test with "
|
||||
"%d actors and %d events per frame\n",
|
||||
|
@ -91,7 +91,6 @@ main (int argc, char *argv[])
|
||||
clutter_test_init (&argc, &argv);
|
||||
|
||||
stage = clutter_test_get_stage ();
|
||||
clutter_stage_set_title (CLUTTER_STAGE (stage), "Random Text");
|
||||
|
||||
clutter_actor_show (stage);
|
||||
|
||||
|
@ -135,7 +135,6 @@ main (int argc, char *argv[])
|
||||
clutter_actor_set_size (stage, STAGE_WIDTH, STAGE_HEIGHT);
|
||||
clutter_actor_set_background_color (CLUTTER_ACTOR (stage),
|
||||
&COGL_COLOR_INIT (0, 0, 0, 255));
|
||||
clutter_stage_set_title (CLUTTER_STAGE (stage), "Text Performance");
|
||||
|
||||
g_signal_connect (CLUTTER_STAGE (stage), "after-paint", G_CALLBACK (on_after_paint), NULL);
|
||||
|
||||
|
@ -59,7 +59,6 @@ main (int argc, char *argv[])
|
||||
clutter_actor_set_size (stage, STAGE_WIDTH, STAGE_HEIGHT);
|
||||
clutter_actor_set_background_color (CLUTTER_ACTOR (stage),
|
||||
&COGL_COLOR_INIT (0, 0, 0, 255));
|
||||
clutter_stage_set_title (CLUTTER_STAGE (stage), "Text");
|
||||
|
||||
group = clutter_actor_new ();
|
||||
clutter_actor_set_size (group, STAGE_WIDTH, STAGE_WIDTH);
|
||||
|
@ -62,7 +62,6 @@ main (int argc, char **argv)
|
||||
clutter_actor_set_size (stage, 512, 512);
|
||||
clutter_actor_set_background_color (CLUTTER_ACTOR (stage),
|
||||
&COGL_COLOR_INIT (0, 0, 0, 255));
|
||||
clutter_stage_set_title (CLUTTER_STAGE (stage), "Picking Performance");
|
||||
g_signal_connect (stage, "destroy", G_CALLBACK (clutter_test_quit), NULL);
|
||||
|
||||
printf ("Picking performance test with "
|
||||
|
@ -109,7 +109,6 @@ main (int argc, char *argv[])
|
||||
stage = clutter_test_get_stage ();
|
||||
clutter_actor_set_size (stage, STAGE_WIDTH, STAGE_HEIGHT);
|
||||
clutter_actor_set_background_color (CLUTTER_ACTOR (stage), &stage_color);
|
||||
clutter_stage_set_title (CLUTTER_STAGE (stage), "Text Performance");
|
||||
g_signal_connect (stage, "destroy", G_CALLBACK (clutter_test_quit), NULL);
|
||||
|
||||
label = create_label ();
|
||||
|
Loading…
x
Reference in New Issue
Block a user