mirror of
https://github.com/brl/mutter.git
synced 2025-08-01 22:24:41 +00:00
Merge branch 'generic-actor-clone'
* generic-actor-clone: Remove CloneTexture from the API [tests] Clean up the Clone interactive test Rename ActorClone to Clone/2 Rename ActorClone to Clone/1 Improves the unit test to verify more awkward scaling and some corresponding fixes Implements a generic ClutterActorClone that doesn't need fbos.
This commit is contained in:
@@ -10,10 +10,15 @@
|
||||
<releaseinfo>Version &version;</releaseinfo>
|
||||
|
||||
<copyright>
|
||||
<year>2008</year>
|
||||
<year>2006,2007,2008</year>
|
||||
<holder>OpenedHand LTD</holder>
|
||||
</copyright>
|
||||
|
||||
<copyright>
|
||||
<year>2009</year>
|
||||
<holder>Intel Corporation</holder>
|
||||
</copyright>
|
||||
|
||||
<legalnotice>
|
||||
<para>
|
||||
Permission is granted to copy, distribute and/or modify this
|
||||
@@ -56,7 +61,7 @@
|
||||
<title>Base actors</title>
|
||||
<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-clone.xml"/>
|
||||
<xi:include href="xml/clutter-text.xml"/>
|
||||
<xi:include href="xml/clutter-cairo-texture.xml"/>
|
||||
</chapter>
|
||||
|
@@ -130,23 +130,23 @@ clutter_alpha_get_type
|
||||
</SECTION>
|
||||
|
||||
<SECTION>
|
||||
<FILE>clutter-clone-texture</FILE>
|
||||
<TITLE>ClutterCloneTexture</TITLE>
|
||||
ClutterCloneTexture
|
||||
ClutterCloneTextureClass
|
||||
clutter_clone_texture_new
|
||||
clutter_clone_texture_get_parent_texture
|
||||
clutter_clone_texture_set_parent_texture
|
||||
<FILE>clutter-clone</FILE>
|
||||
<TITLE>ClutterClone</TITLE>
|
||||
ClutterClone
|
||||
ClutterCloneClass
|
||||
clutter_clone_new
|
||||
clutter_clone_set_source
|
||||
clutter_clone_get_source
|
||||
<SUBSECTION Standard>
|
||||
CLUTTER_CLONE_TEXTURE
|
||||
CLUTTER_IS_CLONE_TEXTURE
|
||||
CLUTTER_TYPE_CLONE_TEXTURE
|
||||
CLUTTER_CLONE_TEXTURE_CLASS
|
||||
CLUTTER_IS_CLONE_TEXTURE_CLASS
|
||||
CLUTTER_CLONE_TEXTURE_GET_CLASS
|
||||
CLUTTER_CLONE
|
||||
CLUTTER_IS_CLONE
|
||||
CLUTTER_TYPE_CLONE
|
||||
CLUTTER_CLONE_CLASS
|
||||
CLUTTER_IS_CLONE_CLASS
|
||||
CLUTTER_CLONE_GET_CLASS
|
||||
<SUBSECTION Private>
|
||||
ClutterCloneTexturePrivate
|
||||
clutter_clone_texture_get_type
|
||||
ClutterClonePrivate
|
||||
clutter_clone_get_type
|
||||
</SECTION>
|
||||
|
||||
<SECTION>
|
||||
|
Reference in New Issue
Block a user