mirror of
https://github.com/brl/mutter.git
synced 2024-12-22 19:12:04 +00:00
2007-06-14 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-box.[ch]: Base class for layout containers. * clutter/clutter-hbox.[ch]: Horizontal box actor. * clutter/clutter-vbox.[ch]: Vertical box actor. * clutter/clutter.h: * clutter/Makefile.am: Build glue * tests/Makefile.am: * tests/test-boxes.c: Test suite for ClutterBox API and implementations.
This commit is contained in:
parent
61c6c24dfa
commit
a1958da910
15
ChangeLog
15
ChangeLog
@ -1,3 +1,18 @@
|
||||
2007-06-14 Emmanuele Bassi <ebassi@openedhand.com>
|
||||
|
||||
* clutter/clutter-box.[ch]: Base class for layout containers.
|
||||
|
||||
* clutter/clutter-hbox.[ch]: Horizontal box actor.
|
||||
|
||||
* clutter/clutter-vbox.[ch]: Vertical box actor.
|
||||
|
||||
* clutter/clutter.h:
|
||||
* clutter/Makefile.am: Build glue
|
||||
|
||||
* tests/Makefile.am:
|
||||
* tests/test-boxes.c: Test suite for ClutterBox API and
|
||||
implementations.
|
||||
|
||||
2007-06-14 Matthew Allum <mallum@openedhand.com>
|
||||
|
||||
* clutter/cogl/gl/cogl.c: (cogl_check_extension):
|
||||
|
@ -46,6 +46,7 @@ source_h = \
|
||||
$(srcdir)/clutter-behaviour-path.h \
|
||||
$(srcdir)/clutter-behaviour-rotate.h \
|
||||
$(srcdir)/clutter-behaviour-scale.h \
|
||||
$(srcdir)/clutter-box.h \
|
||||
$(srcdir)/clutter-clone-texture.h \
|
||||
$(srcdir)/clutter-color.h \
|
||||
$(srcdir)/clutter-container.h \
|
||||
@ -54,6 +55,7 @@ source_h = \
|
||||
$(srcdir)/clutter-feature.h \
|
||||
$(srcdir)/clutter-fixed.h \
|
||||
$(srcdir)/clutter-group.h \
|
||||
$(srcdir)/clutter-hbox.h \
|
||||
$(srcdir)/clutter-keysyms.h \
|
||||
$(srcdir)/clutter-label.h \
|
||||
$(srcdir)/clutter-layout.h \
|
||||
@ -67,6 +69,7 @@ source_h = \
|
||||
$(srcdir)/clutter-effect.h \
|
||||
$(srcdir)/clutter-units.h \
|
||||
$(srcdir)/clutter-util.h \
|
||||
$(srcdir)/clutter-vbox.h \
|
||||
$(srcdir)/clutter-version.h \
|
||||
$(NULL)
|
||||
|
||||
@ -139,15 +142,18 @@ source_c = \
|
||||
clutter-behaviour-path.c \
|
||||
clutter-behaviour-rotate.c \
|
||||
clutter-behaviour-scale.c \
|
||||
clutter-box.c \
|
||||
clutter-color.c \
|
||||
clutter-container.c \
|
||||
clutter-clone-texture.c \
|
||||
clutter-effect.c \
|
||||
clutter-entry.c \
|
||||
clutter-enum-types.c \
|
||||
clutter-event.c \
|
||||
clutter-entry.c \
|
||||
clutter-feature.c \
|
||||
clutter-fixed.c \
|
||||
clutter-group.c \
|
||||
clutter-hbox.c \
|
||||
clutter-label.c \
|
||||
clutter-layout.c \
|
||||
clutter-main.c \
|
||||
@ -158,8 +164,8 @@ source_c = \
|
||||
clutter-texture.c \
|
||||
clutter-timeline.c \
|
||||
clutter-timeout-pool.c \
|
||||
clutter-effect.c \
|
||||
clutter-util.c \
|
||||
clutter-vbox.c \
|
||||
$(NULL)
|
||||
|
||||
source_h_priv = \
|
||||
|
@ -942,9 +942,9 @@ clutter_actor_query_coords (ClutterActor *self,
|
||||
|
||||
static void
|
||||
clutter_actor_set_property (GObject *object,
|
||||
guint prop_id,
|
||||
const GValue *value,
|
||||
GParamSpec *pspec)
|
||||
guint prop_id,
|
||||
const GValue *value,
|
||||
GParamSpec *pspec)
|
||||
{
|
||||
|
||||
ClutterActor *actor;
|
||||
@ -957,23 +957,23 @@ clutter_actor_set_property (GObject *object,
|
||||
{
|
||||
case PROP_X:
|
||||
clutter_actor_set_position (actor,
|
||||
g_value_get_int (value),
|
||||
clutter_actor_get_y (actor));
|
||||
g_value_get_int (value),
|
||||
clutter_actor_get_y (actor));
|
||||
break;
|
||||
case PROP_Y:
|
||||
clutter_actor_set_position (actor,
|
||||
clutter_actor_get_x (actor),
|
||||
g_value_get_int (value));
|
||||
clutter_actor_get_x (actor),
|
||||
g_value_get_int (value));
|
||||
break;
|
||||
case PROP_WIDTH:
|
||||
clutter_actor_set_size (actor,
|
||||
g_value_get_int (value),
|
||||
clutter_actor_get_height (actor));
|
||||
g_value_get_int (value),
|
||||
clutter_actor_get_height (actor));
|
||||
break;
|
||||
case PROP_HEIGHT:
|
||||
clutter_actor_set_size (actor,
|
||||
clutter_actor_get_width (actor),
|
||||
g_value_get_int (value));
|
||||
clutter_actor_get_width (actor),
|
||||
g_value_get_int (value));
|
||||
break;
|
||||
case PROP_OPACITY:
|
||||
clutter_actor_set_opacity (actor, g_value_get_uchar (value));
|
||||
|
@ -151,7 +151,8 @@ struct _ClutterActorClass
|
||||
ClutterActor *old_parent);
|
||||
|
||||
void (* destroy) (ClutterActor *actor);
|
||||
void (* pick) (ClutterActor *actor, const ClutterColor *color);
|
||||
void (* pick) (ClutterActor *actor,
|
||||
const ClutterColor *color);
|
||||
|
||||
/* padding for future expansion */
|
||||
void (*_clutter_actor_1) (void);
|
||||
|
@ -26,14 +26,10 @@
|
||||
#ifndef _HAVE_CLUTTER_H
|
||||
#define _HAVE_CLUTTER_H
|
||||
|
||||
#include "clutter-keysyms.h"
|
||||
#include "clutter-main.h"
|
||||
#include "clutter-actor.h"
|
||||
#include "clutter-alpha.h"
|
||||
#include "clutter-color.h"
|
||||
#include "clutter-util.h"
|
||||
#include "clutter-event.h"
|
||||
#include "clutter-entry.h"
|
||||
#include "clutter-timeout-pool.h"
|
||||
#include "clutter-timeline.h"
|
||||
#include "clutter-container.h"
|
||||
#include "clutter-behaviour.h"
|
||||
#include "clutter-behaviour-bspline.h"
|
||||
#include "clutter-behaviour-ellipse.h"
|
||||
@ -41,21 +37,29 @@
|
||||
#include "clutter-behaviour-path.h"
|
||||
#include "clutter-behaviour-rotate.h"
|
||||
#include "clutter-behaviour-scale.h"
|
||||
#include "clutter-effect.h"
|
||||
#include "clutter-stage.h"
|
||||
#include "clutter-actor.h"
|
||||
#include "clutter-rectangle.h"
|
||||
#include "clutter-container.h"
|
||||
#include "clutter-layout.h"
|
||||
#include "clutter-group.h"
|
||||
#include "clutter-texture.h"
|
||||
#include "clutter-box.h"
|
||||
#include "clutter-clone-texture.h"
|
||||
#include "clutter-label.h"
|
||||
#include "clutter-alpha.h"
|
||||
#include "clutter-media.h"
|
||||
#include "clutter-effect.h"
|
||||
#include "clutter-entry.h"
|
||||
#include "clutter-event.h"
|
||||
#include "clutter-feature.h"
|
||||
#include "clutter-version.h"
|
||||
#include "clutter-enum-types.h"
|
||||
#include "clutter-rectangle.h"
|
||||
#include "clutter-group.h"
|
||||
#include "clutter-hbox.h"
|
||||
#include "clutter-keysyms.h"
|
||||
#include "clutter-label.h"
|
||||
#include "clutter-layout.h"
|
||||
#include "clutter-main.h"
|
||||
#include "clutter-media.h"
|
||||
#include "clutter-stage.h"
|
||||
#include "clutter-texture.h"
|
||||
#include "clutter-timeout-pool.h"
|
||||
#include "clutter-timeline.h"
|
||||
#include "clutter-units.h"
|
||||
#include "clutter-util.h"
|
||||
#include "clutter-vbox.h"
|
||||
#include "clutter-version.h"
|
||||
|
||||
#include "clutter-enum-types.h"
|
||||
|
||||
#endif
|
||||
|
@ -1,3 +1,11 @@
|
||||
2007-06-14 Emmanuele Bassi <ebassi@openedhand.com>
|
||||
|
||||
* clutter-sections.txt:
|
||||
* clutter.types:
|
||||
* clutter-docs.sgml: Add ClutterBox and subclasses. Rework
|
||||
the layout of the API reference, now that we have fairly more
|
||||
classes.
|
||||
|
||||
2007-06-09 Emmanuele Bassi <ebassi@openedhand.com>
|
||||
|
||||
* clutter-sections.txt: Add ClutterTimeoutPool API.
|
||||
|
@ -37,8 +37,11 @@
|
||||
</legalnotice>
|
||||
</bookinfo>
|
||||
|
||||
<chapter>
|
||||
<part id="clutter">
|
||||
<title>Clutter Overview</title>
|
||||
|
||||
<partintro>
|
||||
|
||||
<para>
|
||||
|
||||
Clutter is a GObject based library for creating fast, visually
|
||||
@ -62,35 +65,71 @@
|
||||
modify a property as a function of time.
|
||||
|
||||
</para>
|
||||
</chapter>
|
||||
<chapter>
|
||||
<title>Clutter Actors And Objects</title>
|
||||
<xi:include href="xml/clutter-actor.xml"/>
|
||||
<xi:include href="xml/clutter-container.xml"/>
|
||||
<xi:include href="xml/clutter-layout.xml"/>
|
||||
<xi:include href="xml/clutter-group.xml"/>
|
||||
<xi:include href="xml/clutter-stage.xml"/>
|
||||
<xi:include href="xml/clutter-rectangle.xml"/>
|
||||
<xi:include href="xml/clutter-texture.xml"/>
|
||||
<xi:include href="xml/clutter-clone-texture.xml"/>
|
||||
<xi:include href="xml/clutter-label.xml"/>
|
||||
<xi:include href="xml/clutter-timeline.xml"/>
|
||||
<xi:include href="xml/clutter-media.xml"/>
|
||||
<xi:include href="xml/clutter-entry.xml"/>
|
||||
</chapter>
|
||||
<chapter>
|
||||
<title>Clutter Behaviours</title>
|
||||
<xi:include href="xml/clutter-alpha.xml"/>
|
||||
<xi:include href="xml/clutter-behaviour.xml"/>
|
||||
<xi:include href="xml/clutter-behaviour-bspline.xml"/>
|
||||
<xi:include href="xml/clutter-behaviour-ellipse.xml"/>
|
||||
<xi:include href="xml/clutter-behaviour-opacity.xml"/>
|
||||
<xi:include href="xml/clutter-behaviour-path.xml"/>
|
||||
<xi:include href="xml/clutter-behaviour-rotate.xml"/>
|
||||
<xi:include href="xml/clutter-behaviour-scale.xml"/>
|
||||
</chapter>
|
||||
<chapter>
|
||||
|
||||
</partintro>
|
||||
</part>
|
||||
|
||||
<part id="clutterbase">
|
||||
<title>Clutter Core Reference</title>
|
||||
|
||||
<chapter>
|
||||
<title>Abstract Classes and Interfaces</title>
|
||||
<xi:include href="xml/clutter-actor.xml"/>
|
||||
<xi:include href="xml/clutter-container.xml"/>
|
||||
<xi:include href="xml/clutter-layout.xml"/>
|
||||
<xi:include href="xml/clutter-box.xml"/>
|
||||
<xi:include href="xml/clutter-media.xml"/>
|
||||
</chapter>
|
||||
|
||||
<chapter>
|
||||
<title>Base Actors</title>
|
||||
<xi:include href="xml/clutter-stage.xml"/>
|
||||
<xi:include href="xml/clutter-rectangle.xml"/>
|
||||
<xi:include href="xml/clutter-texture.xml"/>
|
||||
<xi:include href="xml/clutter-clone-texture.xml"/>
|
||||
<xi:include href="xml/clutter-label.xml"/>
|
||||
<xi:include href="xml/clutter-entry.xml"/>
|
||||
</chapter>
|
||||
|
||||
<chapter>
|
||||
<title>Container Actors</title>
|
||||
<xi:include href="xml/clutter-group.xml"/>
|
||||
<xi:include href="xml/clutter-hbox.xml"/>
|
||||
<xi:include href="xml/clutter-vbox.xml"/>
|
||||
</chapter>
|
||||
|
||||
</part>
|
||||
|
||||
<part id="clutteranimation">
|
||||
<title>Clutter Animation Support</title>
|
||||
|
||||
<chapter>
|
||||
<title>Base Classes</title>
|
||||
<xi:include href="xml/clutter-timeline.xml"/>
|
||||
<xi:include href="xml/clutter-alpha.xml"/>
|
||||
<xi:include href="xml/clutter-behaviour.xml"/>
|
||||
</chapter>
|
||||
|
||||
<chapter>
|
||||
<title>Clutter Behaviours</title>
|
||||
<xi:include href="xml/clutter-behaviour-bspline.xml"/>
|
||||
<xi:include href="xml/clutter-behaviour-ellipse.xml"/>
|
||||
<xi:include href="xml/clutter-behaviour-opacity.xml"/>
|
||||
<xi:include href="xml/clutter-behaviour-path.xml"/>
|
||||
<xi:include href="xml/clutter-behaviour-rotate.xml"/>
|
||||
<xi:include href="xml/clutter-behaviour-scale.xml"/>
|
||||
</chapter>
|
||||
|
||||
<chapter>
|
||||
<title>Simple Effects</title>
|
||||
<xi:include href="xml/clutter-effects.xml"/>
|
||||
</chapter>
|
||||
|
||||
</part>
|
||||
|
||||
<part>
|
||||
<title>Clutter Tools</title>
|
||||
|
||||
<xi:include href="xml/clutter-main.xml"/>
|
||||
<xi:include href="xml/clutter-event.xml"/>
|
||||
<xi:include href="xml/clutter-color.xml"/>
|
||||
@ -98,14 +137,19 @@
|
||||
<xi:include href="xml/clutter-fixed.xml"/>
|
||||
<xi:include href="xml/clutter-version.xml"/>
|
||||
<xi:include href="xml/clutter-units.xml"/>
|
||||
</chapter>
|
||||
<chapter>
|
||||
</part>
|
||||
|
||||
<part>
|
||||
<title>Clutter Backends</title>
|
||||
|
||||
<xi:include href="xml/clutter-backend.xml"/>
|
||||
<xi:include href="xml/clutter-glx.xml"/>
|
||||
</chapter>
|
||||
|
||||
<index></index>
|
||||
</part>
|
||||
|
||||
<index>
|
||||
<title>Index</title>
|
||||
</index>
|
||||
|
||||
<appendix id="license">
|
||||
<title>License</title>
|
||||
|
@ -856,3 +856,80 @@ CLUTTER_ENTRY_GET_CLASS
|
||||
ClutterEntryPrivate
|
||||
clutter_entry_get_type
|
||||
</SECTION>
|
||||
|
||||
<SECTION>
|
||||
<FILE>clutter-box</FILE>
|
||||
<TITLE>ClutterBox</TITLE>
|
||||
ClutterBox
|
||||
ClutterBoxClass
|
||||
clutter_box_set_spacing
|
||||
clutter_box_get_spacing
|
||||
clutter_box_pack_start
|
||||
clutter_box_pack_end
|
||||
clutter_box_query_child
|
||||
clutter_box_query_nth_child
|
||||
<SUBSECTION Standard>
|
||||
CLUTTER_TYPE_BOX
|
||||
CLUTTER_BOX
|
||||
CLUTTER_IS_BOX
|
||||
CLUTTER_BOX_CLASS
|
||||
CLUTTER_IS_BOX_CLASS
|
||||
CLUTTER_BOX_GET_CLASS
|
||||
<SUBSECTION Private>
|
||||
clutter_box_get_type
|
||||
</SECTION>
|
||||
|
||||
<SECTION>
|
||||
<FILE>clutter-effects</FILE>
|
||||
<TITLE>Clutter Effects</title>
|
||||
ClutterEffectTemplate
|
||||
ClutterEffectTemplaceClass
|
||||
clutter_effect_template_new
|
||||
ClutterEffectCompleteFunc
|
||||
clutter_effect_fade
|
||||
clutter_effect_move
|
||||
clutter_effect_scale
|
||||
<SUBSECTION Standard>
|
||||
CLUTTER_TYPE_EFFECT_TEMPLATE
|
||||
CLUTTER_EFFECT_TEMPLATE
|
||||
CLUTTER_IS_EFFECT_TEMPLATE
|
||||
CLUTTER_EFFECT_TEMPLATE_CLASS
|
||||
CLUTTER_IS_EFFECT_TEMPLATE_CLASS
|
||||
CLUTTER_EFFECT_TEMPLATE_GET_CLASS
|
||||
<SUBSECTION Private>
|
||||
clutter_effect_template_get_type
|
||||
</SECTION>
|
||||
|
||||
<SECTION>
|
||||
<FILE>clutter-hbox</FILE>
|
||||
<TITLE>ClutterHBox</TITLE>
|
||||
ClutterHBox
|
||||
ClutterHBoxClass
|
||||
clutter_hbox_new
|
||||
<SUBSECTION Standard>
|
||||
CLUTTER_TYPE_HBOX
|
||||
CLUTTER_HBOX
|
||||
CLUTTER_IS_HBOX
|
||||
CLUTTER_HBOX_CLASS
|
||||
CLUTTER_IS_HBOX_CLASS
|
||||
CLUTTER_HBOX_GET_CLASS
|
||||
<SUBSECTION Private>
|
||||
clutter_hbox_get_type
|
||||
</SECTION>
|
||||
|
||||
<SECTION>
|
||||
<FILE>clutter-vbox</FILE>
|
||||
<TITLE>ClutterVBox</TITLE>
|
||||
ClutterVBox
|
||||
ClutterVBoxClass
|
||||
clutter_vbox_new
|
||||
<SUBSECTION Standard>
|
||||
CLUTTER_TYPE_VBOX
|
||||
CLUTTER_VBOX
|
||||
CLUTTER_IS_VBOX
|
||||
CLUTTER_VBOX_CLASS
|
||||
CLUTTER_IS_VBOX_CLASS
|
||||
CLUTTER_VBOX_GET_CLASS
|
||||
<SUBSECTION Private>
|
||||
clutter_vbox_get_type
|
||||
</SECTION>
|
||||
|
@ -19,5 +19,7 @@ clutter_behaviour_path_get_type
|
||||
clutter_behaviour_rotate_get_type
|
||||
clutter_behaviour_scale_get_type
|
||||
clutter_backend_get_type
|
||||
clutter_vertices_get_type
|
||||
clutter_entry_get_type
|
||||
clutter_box_get_type
|
||||
clutter_hbox_get_type
|
||||
clutter_vbox_get_type
|
||||
|
@ -1,5 +1,6 @@
|
||||
noinst_PROGRAMS = test-textures test-events test-offscreen test-scale \
|
||||
test-actors test-behave test-text test-entry test-project
|
||||
test-actors test-behave test-text test-entry test-project \
|
||||
test-boxes
|
||||
|
||||
INCLUDES = -I$(top_srcdir)/
|
||||
LDADD = $(top_builddir)/clutter/libclutter-@CLUTTER_FLAVOUR@-@CLUTTER_MAJORMINOR@.la
|
||||
@ -14,4 +15,5 @@ test_actor_SOURCES = test-actors.c
|
||||
test_behave_SOURCES = test-behave.c
|
||||
test_text_SOURCES = test-text.c
|
||||
test_entry_SOURCES = test-entry.c
|
||||
test_project_SOURCES = test-project.c
|
||||
test_project_SOURCES = test-project.c
|
||||
test_boxes_SOURCES = test-boxes.c
|
||||
|
Loading…
Reference in New Issue
Block a user