Adeel Kazmi [Mon, 18 May 2015 17:39:46 +0000 (18:39 +0100)]
Added Test cases for Constraints
Change-Id: I0d6b2d1c243e7a722dcd40a4c06bc904b541c47b
Nick Holland [Fri, 15 May 2015 16:08:18 +0000 (17:08 +0100)]
Add extension to PropertyInput
Change-Id: Id4b533d23b8471f7687035bfc2a97fe9ef1535ee
Yoonsang Lee [Wed, 20 May 2015 02:36:18 +0000 (11:36 +0900)]
Fix CallbackBase::Execute assertion to arise in both debug/release build
- DALI_ASSERT_DEBUG -> DALI_ASSERT_ALWAYS
- With DALI_ASSERT_DEBUG, UtcDaliSignalConnectN01() only passes in case
of debug build.
- If an exception is required for null signal callback, it should arise
in both debug / release build.
Change-Id: I2b89889c86da8d8e3336a69377bfbad8e1d0d02b
Adeel Kazmi [Tue, 19 May 2015 13:37:26 +0000 (06:37 -0700)]
Merge "Cleaning up size negotiation - Check for recursive SetSize from inside OnSizeSet - Dont call onSizeSet unless size actually changed - Fix width for height to treat 0 size as 1:1 aspect ratio - Add base helpers for width for height" into tizen
Andrew Cox [Mon, 18 May 2015 18:25:45 +0000 (19:25 +0100)]
Tests for IntrusivePtr and deleted ScopedPointer
One last test still to do.
Change-Id: I10345cf9baf29ae1492f1940cbccdcd0a18712b1
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
Kimmo Hoikka [Mon, 18 May 2015 17:02:10 +0000 (18:02 +0100)]
Cleaning up size negotiation
- Check for recursive SetSize from inside OnSizeSet
- Dont call onSizeSet unless size actually changed
- Fix width for height to treat 0 size as 1:1 aspect ratio
- Add base helpers for width for height
Change-Id: Ib8bd5f3e347df0d66ea504f659c3c416800be4fb
Ferran Sole [Tue, 19 May 2015 08:19:17 +0000 (09:19 +0100)]
Added Dali::Path test cases for DownCast and assignment operator
Change-Id: I9aeae9bd022ac6ba90a4c513428713f2a89059e9
Lee Morgan [Wed, 22 Apr 2015 16:21:26 +0000 (17:21 +0100)]
UTC tests; PropertyValue, Vector2/3/4, Matrix
Change-Id: Ic2318531b7e1b9b558340e755bd7738547d701a3
Nick Holland [Fri, 15 May 2015 10:59:33 +0000 (11:59 +0100)]
Move more public-api headers to devel-api. PART 2
Removed the following files from public-api and placed in devel-api
dali/public-api/actors/mesh-actor.h
dali/public-api/animation/path-constrainer.h
dali/public-api/common/hash.h
dali/public-api/common/mutex.h
dali/public-api/common/ref-counted-dali-vector.h
dali/public-api/common/scoped-pointer.h
dali/public-api/events/hit-test-algorithm.h
dali/public-api/geometry/animatable-mesh.h
dali/public-api/geometry/animatable-vertex.h
dali/public-api/geometry/cloth.h
dali/public-api/geometry/mesh-data.h
dali/public-api/geometry/mesh-factory.h
dali/public-api/geometry/mesh.h
dali/public-api/images/atlas.h
dali/public-api/images/distance-field.h
dali/public-api/images/image-operations.h
dali/public-api/images/native-image-interface.h
dali/public-api/modeling/bone.h
dali/public-api/modeling/material.h
dali/public-api/object/type-registry-helper.h
Change-Id: Id65fd245b761b3e326bfcb70ddb48f1b350fe17f
Kimmo Hoikka [Fri, 15 May 2015 10:54:47 +0000 (11:54 +0100)]
Fix crash in exit of dali applications
[Problem] stage called rootactor.Remove( cameraActor ) during destruction, which attempts to kick start a size negotiation
[Solution] do not call Remove, just release the handle
Change-Id: I475f7fb17f45141ad001827db1f775a37e77eb78
Nick Holland [Mon, 11 May 2015 13:15:12 +0000 (14:15 +0100)]
Create devel-api folder for header files used by Adaptor/Toolkit
Moved the following from public-api to devel-api:
map-wrapper
set-wrapper
dynamics
Change-Id: If8d7c30fa48c893e1433bc4cf0585ccffe55cc83
Adeel Kazmi [Thu, 14 May 2015 15:40:37 +0000 (08:40 -0700)]
Merge "Add dali-vector extension support for types that have destructor and/or copy constructor but are still POD" into tizen
Kimmo Hoikka [Thu, 14 May 2015 12:55:58 +0000 (13:55 +0100)]
Add dali-vector extension support for types that have destructor and/or copy constructor but are still POD
Change-Id: Ic4aa6336d6d3514d5c2d487d7550ae788be9eb70
Lee Morgan [Tue, 12 May 2015 13:25:16 +0000 (14:25 +0100)]
Added PropertyValue Array as a class
Change-Id: If7dba0e31a53eada586a05a86bb2f23274645aee
Andrew Cox [Tue, 17 Mar 2015 15:38:31 +0000 (15:38 +0000)]
API for eager GLTexture Creation in NativeImage
Change-Id: I975c87cfdb59921695ecfb8ceedd741df238297e
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
Nick Holland [Tue, 12 May 2015 13:03:52 +0000 (14:03 +0100)]
Remove ActorContainer typedef
Also removed some unnecessary includes of <vector-wrapper.h> from
public-api files
Change-Id: I158193751290c01614f2a05211dd629bb5cf04fd
Adeel Kazmi [Wed, 13 May 2015 08:52:25 +0000 (01:52 -0700)]
Merge "Refactoring of path constraints + LinearConstrainer" into tizen
Ferran Sole [Thu, 9 Apr 2015 15:53:23 +0000 (16:53 +0100)]
Refactoring of path constraints + LinearConstrainer
- Renamed to PathConstrainer ( an object who applies constraints ).
- Added a base class (Constrainer) who is responsible for observing constrained objects
and remove the constraints created when it is destroyed.
- Removed range property. Range is now specified in the 'apply' method.
- Added new properties "points" and "control-points" to specify the path.
- Added option to wrap source property value inside a given domain.
- Added LinearConstrainer object to constraint properties given a linear map
Change-Id: Iea89384808505881057c1d75d8e1929b14ecd3d3
Paul Wisbey [Tue, 12 May 2015 14:52:43 +0000 (15:52 +0100)]
Removed remaining references to glyph cache
Change-Id: Ie476593b5d04cd5aecaed8eaee075325423b0840
Kimmo Hoikka [Tue, 12 May 2015 15:14:42 +0000 (08:14 -0700)]
Merge "Reduce ImageActor & RenderableActor APIs" into tizen
Nick Holland [Fri, 17 Apr 2015 14:18:32 +0000 (15:18 +0100)]
dali-signal and connection tracker test cases
Added tests to match new test standard of 1 positive 1 negative
test per API (where possible).
Change-Id: I44e658891e504db21316ced0f621b661a45f7989
Kimmo Hoikka [Tue, 12 May 2015 12:48:06 +0000 (13:48 +0100)]
Remove dependency to std::vector and property::value from property notification API
[Problem] inefficient API, unnecessary dependencies
[Solution] change to Dali::Vector
Change-Id: I579d1060c54444d725bcb24124f7e67a501289c2
Kimmo Hoikka [Tue, 12 May 2015 10:56:41 +0000 (03:56 -0700)]
Merge "Fix uninitialized mResourceClient in NinePatchImage" into tizen
Yoonsang Lee [Mon, 11 May 2015 12:23:49 +0000 (21:23 +0900)]
Reduce ImageActor & RenderableActor APIs
- Remove ImageActor::IsPixelAreaSet(), ClearPixelArea()
- Remove RenderableActor::SetBlendFunc(), SetBlendEquation(), GetBlendEquation(), SetBlendColor(), GetBlendColor()
Change-Id: I979f8c2ddf3af0716844568d62cc7caf9eb07433
Paul Wisbey [Fri, 8 May 2015 15:13:29 +0000 (08:13 -0700)]
Merge "Remove unnecessary dead variable and unnecessary include" into tizen
Nick Holland [Fri, 8 May 2015 12:52:12 +0000 (13:52 +0100)]
DALi Version 1.0.41
Change-Id: I8db45baf97da4ada478d61ae1a0072609d1dc8df
Kimmo Hoikka [Thu, 7 May 2015 13:05:28 +0000 (14:05 +0100)]
Remove unnecessary dead variable and unnecessary include
Change-Id: I92dea2209158ad0fb1ca04dade6c988089ea9bff
Lee Morgan [Fri, 1 May 2015 11:43:58 +0000 (12:43 +0100)]
Fixed geometry hints property
Change-Id: Id52fa1800a7a2daa786551d11b9dd8ce78e5feb3
Yoonsang Lee [Thu, 7 May 2015 08:38:40 +0000 (17:38 +0900)]
Fix uninitialized mResourceClient in NinePatchImage
Change-Id: I4b0f20ad6cc88d1e222e3aa5bc8b74bd6c58788f
Kimmo Hoikka [Tue, 5 May 2015 16:05:12 +0000 (09:05 -0700)]
Merge "Allow registering property components for animatable properties" into tizen
Andrew Cox [Fri, 24 Apr 2015 19:12:28 +0000 (20:12 +0100)]
Cleaned up signed / unsigned mismatch in FixedSizeMemoryPool tests
Was causing compiler warnings.
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
Change-Id: I2e8bf5ce9d2a6fd945bd112112c4731bcff61519
Adeel Kazmi [Fri, 1 May 2015 06:50:06 +0000 (23:50 -0700)]
Merge "Remove un-used GetChildren internal actor api" into tizen
Nick Holland [Thu, 30 Apr 2015 14:22:04 +0000 (15:22 +0100)]
Remove un-used GetChildren internal actor api
Change-Id: Iac7817dcd99315d102f033c56328a5ac8bbff52a
David Steele [Wed, 22 Apr 2015 15:39:30 +0000 (16:39 +0100)]
Downgraded assert on SetUniform to a log error.
Change-Id: Id71cd9785f0a828745be9c49ab699e64ef74347c
Signed-off-by: David Steele <david.steele@partner.samsung.com>
Richard Huang [Tue, 28 Apr 2015 13:04:20 +0000 (14:04 +0100)]
Allow registering property components for animatable properties
Use AnimatablePropertyComponentRegistration or DALI_ANIMATABLE_PROPERTY_COMPONENT_REGISTRATION
to register property components for animatable properties that support property component (i.e.
Vector2, Vector3 or Vector4).
Change-Id: Ia9f780f75961b4b6ab90d7a45440c126dbc40c3f
Lee Morgan [Wed, 29 Apr 2015 14:34:00 +0000 (15:34 +0100)]
DALi Version 1.0.40
Change-Id: Ic7c7d1e6e0384df33cbda5be10e34d77fcdbc317
Adeel Kazmi [Mon, 27 Apr 2015 09:39:35 +0000 (10:39 +0100)]
Remove boost from the build as well
Change-Id: Ibfab3d31452b5b0715a705339b4e4b8a31ba0c32
Ferran Sole [Mon, 20 Apr 2015 13:35:58 +0000 (14:35 +0100)]
AlphaFunction refactoring
Removed all the alpha functions from public api. Alpha functions can now be
defined using an enum to use one of the predefined alpha functions, a pointer,
to define a custom alpha function, or two Vector2 which are used for cubic bezier
alpha function.
The new API is used as follows:
//Using a predefined alpha function
animation.AnimateTo( property, value, AlphaFunction::EASE_IN_OUT );
//Using a custom alpha function
animation.AnimateTo( property, value, &my_alpha_function );
//Using a bezier alpha function
animation.AnimateTo( property, value, AlphaFunction(Vector2(0.0f,1.0f),Vector2(1.0f,0.0f) ) );
Change-Id: I4051c752d826770447923b6e9a3215f2575d6370
Adeel Kazmi [Fri, 24 Apr 2015 10:33:48 +0000 (11:33 +0100)]
(Properties) OnPropertySet is called when any property is set
Change-Id: I075dca41b6bd975cd0a682ef62f4296d094334ab
Xiangyin Ma [Thu, 23 Apr 2015 11:04:13 +0000 (12:04 +0100)]
DALi Version 1.0.39
Change-Id: I8e0aa8c61691b706a0b37549bf95d15ce24c83e5
Kimmo Hoikka [Wed, 22 Apr 2015 15:30:43 +0000 (08:30 -0700)]
Merge "Added animation and constraint support for UNSIGNED_INTEGER property type" into tizen
Tom Robinson [Tue, 21 Apr 2015 14:14:53 +0000 (15:14 +0100)]
Type registry macros made namespace-generic: core
Change-Id: I730f9451fe8e92cef34e08c31c65efe2e001d8e5
David Steele [Thu, 2 Apr 2015 15:30:42 +0000 (16:30 +0100)]
Added animation and constraint support for UNSIGNED_INTEGER property type
Change-Id: Idbb1a954584d2528a5de7912082054c0f4313d27
Adeel Kazmi [Wed, 22 Apr 2015 10:23:39 +0000 (03:23 -0700)]
Merge "Remove unnecessary stream operators from radian and degree as well as unnecessary Degree constructor from AngleAxis" into tizen
Tom Robinson [Tue, 21 Apr 2015 11:02:21 +0000 (12:02 +0100)]
Update copyright year to 2015 for public api: core
Change-Id: I5c250b9cbc7bfd8f44720f3b4969292db5da7d7b
Kimmo Hoikka [Tue, 21 Apr 2015 10:38:50 +0000 (11:38 +0100)]
Remove unnecessary stream operators from radian and degree as well as unnecessary Degree constructor from AngleAxis
Change-Id: Ia9fe5699e21b938786508ba63a9082dcbbc99523
Kingsley Stephens [Tue, 21 Apr 2015 10:37:39 +0000 (11:37 +0100)]
Fix Actor size negotiation test cases
Change-Id: Id915d9f6c473e113ecea062233488d7eb6adb66a
Kimmo Hoikka [Mon, 20 Apr 2015 17:13:34 +0000 (10:13 -0700)]
Merge "Size negotiation patch 4: Remove SetRelayoutEnabled" into tizen
Kimmo Hoikka [Mon, 20 Apr 2015 17:11:19 +0000 (10:11 -0700)]
Merge "Remove ImageAttributes from public API" into tizen
Adeel Kazmi [Mon, 20 Apr 2015 15:13:24 +0000 (08:13 -0700)]
Merge "Add size negotiation tests to Actor" into tizen
Kingsley Stephens [Tue, 14 Apr 2015 12:59:24 +0000 (13:59 +0100)]
Size negotiation patch 4: Remove SetRelayoutEnabled
Change-Id: I051397fc53fe326ee377c8d36ac0b623201a4ea2
Andrew Cox [Fri, 20 Mar 2015 17:59:45 +0000 (17:59 +0000)]
Remove ImageAttributes from public API
The point is to clean up the API and bury ImageAttributes.
A later patch will rewrite internals not to use it at all.
Change-Id: I58c738101c61ab1dc2c7b25894c933006aa9da50
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
Adeel Kazmi [Mon, 20 Apr 2015 13:44:05 +0000 (06:44 -0700)]
Merge "Constraint sources may be destroyed before Constraint::Apply()" into tizen
Paul Wisbey [Mon, 20 Apr 2015 13:02:35 +0000 (06:02 -0700)]
Merge "Added P/N test cases, fixed last 2 cases." into tizen
Kingsley Stephens [Mon, 20 Apr 2015 10:30:40 +0000 (11:30 +0100)]
Add size negotiation tests to Actor
Change-Id: Iace20dec34a99c6ad5b6b0cdb709ee45db526399
Paul Wisbey [Sat, 18 Apr 2015 13:48:55 +0000 (14:48 +0100)]
Constraint sources may be destroyed before Constraint::Apply()
Change-Id: I85fbd2cc4f1d7aa3e70888d0130f9ed4dcbf5a65
Kimmo Hoikka [Fri, 17 Apr 2015 18:13:33 +0000 (11:13 -0700)]
Merge "Cleaned up Degree, Radian, AngleAxis and Quaternion classes - Inline Degree, Radian and AngleAxis types to avoid unnecessary exports / export table lookups in using code - Change AngleAxis to store a Radian angle for better accuracy - Make Quaternion explicitly take a Radian as constructor" into tizen
David Steele [Fri, 17 Apr 2015 17:01:00 +0000 (18:01 +0100)]
Added P/N test cases, fixed last 2 cases.
UtcDaliRenderTaskOnce03 was expecting a behaviour that Dali should
have but doesn't - i.e. a draw should not happen if the scene does not
update, but currently, it renders twice more with the old render items.
Have fixed the test case to handle this.
UtcDaliRenderTaskOnce08 was broken - it didn't set the sync variable,
and thus could not get the finished signal. Have set it appropriately,
and corrected the test case.
Change-Id: Idf57356a5a2170ab27051bcd6b222613a3a1d8c3
Signed-off-by: David Steele <david.steele@partner.samsung.com>
Kimmo Hoikka [Fri, 17 Apr 2015 16:11:14 +0000 (09:11 -0700)]
Merge "Update UTC for type-registry.h" into tizen
Richard Huang [Thu, 16 Apr 2015 14:54:05 +0000 (15:54 +0100)]
Update UTC for type-registry.h
Change-Id: Ie3db4bdc8410465fa9ad24a27230b5554d6152f9
Tom Robinson [Thu, 16 Apr 2015 15:36:44 +0000 (16:36 +0100)]
Dynamics build fix
Change-Id: I16aa313ecf6000e005bba5059a9fb815a5d1ab61
Kimmo Hoikka [Tue, 14 Apr 2015 15:03:14 +0000 (16:03 +0100)]
Cleaned up Degree, Radian, AngleAxis and Quaternion classes
- Inline Degree, Radian and AngleAxis types to avoid unnecessary exports / export table lookups in using code
- Change AngleAxis to store a Radian angle for better accuracy
- Make Quaternion explicitly take a Radian as constructor
Change-Id: I25bacfb011d4f24d60cabb53b7993dc51633b175
HyunJu Shin [Thu, 16 Apr 2015 07:17:00 +0000 (00:17 -0700)]
Merge "- Update UTC for animation.h - Remove assert when duration is 0 in Animation::SetDuration() because the duration can be 0 in Animation::New()." into tizen
Ferran Sole [Wed, 15 Apr 2015 11:57:47 +0000 (12:57 +0100)]
DALi Version 1.0.38
Change-Id: I5d20db202772d4cc738f39589ee12ede7bc05980
Kimmo Hoikka [Tue, 14 Apr 2015 10:53:13 +0000 (03:53 -0700)]
Merge "Add cmake to the required system packages list in dali_env" into tizen
Kimmo Hoikka [Tue, 14 Apr 2015 10:52:32 +0000 (03:52 -0700)]
Merge "Size negotiation patch 3: Scope size negotiation enums" into tizen
Heeyong Song [Tue, 14 Apr 2015 07:28:53 +0000 (16:28 +0900)]
- Update UTC for animation.h
- Remove assert when duration is 0 in Animation::SetDuration() because the duration can be 0 in Animation::New().
Change-Id: Ib1c94f7e03956b873cb9151265c79e4a1b5327ec
Kingsley Stephens [Thu, 9 Apr 2015 14:03:14 +0000 (15:03 +0100)]
Size negotiation patch 3: Scope size negotiation enums
Fix FIT_TO_CHILDREN
Change-Id: Iac313b8df1e3e4febd3c3cf162ca1f7c033a4a34
Nick Holland [Mon, 13 Apr 2015 09:40:59 +0000 (10:40 +0100)]
Remove last reference to boost in dali-core
Removed boost::function declared in property-notifcation-declarations.h
which was being included by handle.h, which is include by
most of DALi. The boost function.hpp header was pulling in a
total of 179 other boost header files.
Some files using strcmp, memcpy and memmove no longer compiled after the
removal, so they now include <cstring> which has the API for those functions.
On an i7 with make -j8 dali-core now compiles 20% faster
Change-Id: Ic03c1efaa3f234b3777a4828b6c5e8e28bf1ff75
Yoonsang Lee [Mon, 13 Apr 2015 02:33:20 +0000 (11:33 +0900)]
Add cmake to the required system packages list in dali_env
Change-Id: I80474b0c52f823cce2fb8a65aeeb73a272e585d4
Kimmo Hoikka [Fri, 10 Apr 2015 16:15:16 +0000 (17:15 +0100)]
Only include forward declaring iostream header in public API
Change-Id: I10e1abe3f89277073db9566dc4e7ee5ad7af1628
Kimmo Hoikka [Fri, 10 Apr 2015 14:52:45 +0000 (07:52 -0700)]
Merge "DALi Version 1.0.37" into tizen
Kingsley Stephens [Fri, 10 Apr 2015 14:35:19 +0000 (15:35 +0100)]
DALi Version 1.0.37
Change-Id: I66e880f3240f8ec61ecdbb2eddb8445b68b59e3c
Kimmo Hoikka [Fri, 10 Apr 2015 14:19:15 +0000 (07:19 -0700)]
Merge "Moved hash function to public-api" into tizen
Victor Cebollada [Fri, 10 Apr 2015 10:12:43 +0000 (11:12 +0100)]
Add harfbuzz to the package list.
Change-Id: Id51926a053cae5572c9d72e4d5457dd1c862deec
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Nick Holland [Thu, 9 Apr 2015 09:48:50 +0000 (10:48 +0100)]
Moved hash function to public-api
Change-Id: Ia51940a6435d92f5d59455ff7393bc0a725efac8
Paul Wisbey [Thu, 9 Apr 2015 15:48:58 +0000 (16:48 +0100)]
Merge branch 'new_text' into tizen
Change-Id: I845577c7ed3878dd1f22718f395afe86acd55863
Paul Wisbey [Thu, 9 Apr 2015 10:55:48 +0000 (11:55 +0100)]
Merge remote-tracking branch 'origin/tizen' into new_text
Conflicts:
automated-tests/src/dali-internal/CMakeLists.txt
automated-tests/src/dali/CMakeLists.txt
Change-Id: Icbd7f85f995462af30937b35579564640a027afd
Kingsley Stephens [Wed, 8 Apr 2015 13:10:46 +0000 (14:10 +0100)]
Size negotiation patch 2: Move SetPreferredSize into actor-impl.cpp
Fix for putting an actor hierarchy onto stage.
Change-Id: Ib48ea5f2a5dde292292fe18a415fb0d6e749252a
Adeel Kazmi [Wed, 11 Mar 2015 14:13:57 +0000 (14:13 +0000)]
New Constraints
BEFORE:
struct MyObject
{
MyObject( Vector3 input )
: mInput( input ) { }
Vector3 operator()( const Vector3& current, const PropertyInput& parentSize )
{
return current * parentSize.GetVector3() * mInput;
}
Vector3 mInput;
};
...
Actor actor = Actor::New();
Constraint constraint = Constraint::New< Vector3 >( Actor::Property::POSITION,
ParentSource( Actor::Property::SIZE ),
MyObject( Vector::ONE ) );
actor.ApplyConstraint( constraint );
NOW:
struct MyObject
{
MyObject( Vector3 input )
: mInput( input ) { }
void operator()( Vector3& current, const PropertyInputContainer& inputs )
{
current *= inputs[0]->GetVector3() * mInput;
}
Vector3 mInput;
};
...
Actor actor = Actor::New();
Constraint constraint = Constraint::New< Vector3 >( actor, Actor::Property::POSITION, MyObject( Vector::ONE ) );
constraint.AddSource( ParentSource( Actor::Property::SIZE ) );
constraint.Apply();
DESCRIPTION OF CHANGES:
- Constraints take a handle as parameter
- AddSource to add a source
- Constraints no longer copied unless absolutely required
- Constraints can be cloned for another object
- Replaced the New methods in Dali::Constraint
- Use one constraint function
- Inputs are passed in via Dali::Vector< PropertyInput* >
- Only one PropertyConstraint class being used now
- Constraint function has no return
- Remove PropertyInputComponentAccessor and moved its functionality into PropertyInputAccessor for the time being
- Currently using std::vector internally as Dali::Vector cannot support non-trivial types
- Updated Path Constraints to use new constraints
- Replace boost::function usage in Constraints
- Remove weight property from constraints
- Constraint is no longer an Object, it is a base-object
- Remove duplicated data from Internal::Constraint
- Combine Constraint & ActiveConstraint
Change-Id: I210afffae45820e17ecd901a4106b5f735b2b1a8
Paul Wisbey [Tue, 7 Apr 2015 09:46:40 +0000 (10:46 +0100)]
Merge remote-tracking branch 'origin/tizen' into new_text
Change-Id: I08714ae8f982734b411033a121669a0d7cec98b1
Adeel Kazmi [Fri, 3 Apr 2015 05:51:07 +0000 (06:51 +0100)]
DALi Version 1.0.36
Change-Id: Ib03d3aff417f0051eaae07cd2566971c48710bfa
Adeel Kazmi [Thu, 2 Apr 2015 17:57:42 +0000 (10:57 -0700)]
Merge "Size negotiation patch 1: Remove actor SetPreferredSize" into tizen
Kingsley Stephens [Tue, 31 Mar 2015 16:35:45 +0000 (17:35 +0100)]
Size negotiation patch 1: Remove actor SetPreferredSize
Also merge SizeMode enum into ResizePolicies,
fixed control backing, made actor SetSize override size policy to FIXED, removed SetDimensionDependency
from Actor public API
Change-Id: I90b98248a089d2a83064f6bed6e25254e5edd6eb
Richard Huang [Wed, 1 Apr 2015 14:54:35 +0000 (15:54 +0100)]
Lazy register animatable property if not registered yet
Change-Id: I25bbda12ebf4f811653387b187718387a399bb14
Paul Wisbey [Wed, 1 Apr 2015 14:28:12 +0000 (15:28 +0100)]
Removed some TextActor dependent tests
Change-Id: I8825724dab25d223836561b55ff6f95983e91753
Richard Huang [Mon, 30 Mar 2015 14:57:17 +0000 (15:57 +0100)]
Remove compile time assert for animatable property registration
The compile time assert to check the order of the properties relies on
the __COUNTER__ macro which generates sequential integral values starting
from 0 at compile time and there is no way to reset it. Therefore, while
using __COUNTER_ for both DALI_PROPERTY_REGISTRATION and
DALI_ANIMATABLE_PROPERTY_REGISTRATION, depending on which macro is called
first, the condition used by the assert in the other macro will always
get the wrong count.
Change-Id: I7c263cc505050fa9bf73d652a1535fd652ec7596
Heeyong Song [Tue, 31 Mar 2015 01:48:02 +0000 (10:48 +0900)]
Remove non-public APIs of Animation
Change-Id: Id15588f8809069503782b2aadc5dc93df87dd4ec
Paul Wisbey [Mon, 30 Mar 2015 15:26:59 +0000 (16:26 +0100)]
Merge remote-tracking branch 'origin/tizen' into new_text
Conflicts:
automated-tests/src/dali/utc-Dali-HitTestAlgorithm.cpp
dali/internal/common/core-impl.cpp
dali/internal/common/core-impl.h
dali/internal/event/common/thread-local-storage.cpp
dali/internal/event/common/thread-local-storage.h
dali/internal/file.list
dali/internal/render/renderers/scene-graph-text-renderer.cpp
dali/public-api/dali-core.h
Change-Id: Ia39397ce21005dd731862e4e1d4e3cb1ebabe92f
Kingsley Stephens [Thu, 20 Nov 2014 12:54:38 +0000 (12:54 +0000)]
New size negotiation
Change-Id: Ie58e896029fc35dfb4a41d63ea68af3b5d8de6e7
Adeel Kazmi [Mon, 30 Mar 2015 13:24:43 +0000 (06:24 -0700)]
Merge "Look into the range of animatable properties while retrieving Actor's constraint input property" into tizen
Adeel Kazmi [Mon, 30 Mar 2015 10:27:04 +0000 (03:27 -0700)]
Merge "Remove Dynamics APIs from actor.h" into tizen
Richard Huang [Wed, 25 Mar 2015 17:28:52 +0000 (17:28 +0000)]
Look into the range of animatable properties while retrieving Actor's constraint input property
Change-Id: I078c54679b93b4cbaf835343b7bae81e4a6015ac
Paul Wisbey [Wed, 25 Mar 2015 11:45:14 +0000 (11:45 +0000)]
Don't Update twice after a property setter
Change-Id: Iee6daee6ed6fe25f147744d0022f0717401ecbd1
Nick Holland [Fri, 27 Mar 2015 10:01:41 +0000 (10:01 +0000)]
Remove Performance Monitor code
Kept some empty macros in-place should we want to restore functionality
for logging information adaptor does not have. E.g. The start/end
of message processing / constraint processing.
And some counters relating to floating point multiplies etc.
Change-Id: I93c4e9eefd30192194f1ff506cda37af6652c4d7
Heeyong Song [Fri, 27 Mar 2015 00:58:03 +0000 (09:58 +0900)]
Remove Dynamics APIs from actor.h
Change-Id: Id745959c96ee7854aadeef26a932afe24eabb41a
Adeel Kazmi [Wed, 25 Mar 2015 15:06:39 +0000 (08:06 -0700)]
Merge "DALi Version 1.0.35" into tizen
Tom Robinson [Wed, 25 Mar 2015 14:02:01 +0000 (14:02 +0000)]
DALi Version 1.0.35
Change-Id: Id9c74f820e8c3bcb7abcf865663ed5ad1ce6c709
Adeel Kazmi [Wed, 25 Mar 2015 11:28:05 +0000 (04:28 -0700)]
Merge "Remove pointless boost includes" into tizen
Adeel Kazmi [Wed, 25 Mar 2015 09:17:56 +0000 (02:17 -0700)]
Merge "Added PathConstraint object." into tizen