platform/core/uifw/dali-toolkit.git
8 years ago[dali_1.2.14] Merge branch 'devel/master' 64/97264/1
Adeel Kazmi [Fri, 11 Nov 2016 18:41:05 +0000 (18:41 +0000)]
[dali_1.2.14] Merge branch 'devel/master'

Change-Id: I3bbf18b3f11e44ed5ab56742ac954d3e222e68a9

8 years agoDALi Version 1.2.14 60/97260/1 dali_1.2.14
Adeel Kazmi [Fri, 11 Nov 2016 18:40:19 +0000 (18:40 +0000)]
DALi Version 1.2.14

Change-Id: I2440ff2ec6d99f1f5b355f71d8f63122f644c828

8 years agoPublished the AsyncImageLoader and SyncImageLoader to the public API 78/96978/15
Tom Robinson [Thu, 10 Nov 2016 15:33:03 +0000 (15:33 +0000)]
Published the AsyncImageLoader and SyncImageLoader to the public API

The AsyncImageLoader API allows asynchronous image loading via an internal thread.
Multiple images can be loaded with one AsyncImageLoader.
The load of each image returns an ID.
This ID is returned, along with the pixel data in a signal once the load for each individual image has completed.

The SyncImageLoader allows synchronous image loading.
It consists of a set of Load functions mirroring the prototypes of the Load functions within the AsyncImageLoader.
The loads are performed within the same thread (the thread is blocked whilst loading).

Change-Id: If1d59bf5981de5f52371bd5838371b41031d1fd4

8 years agoRegister Transform uniforms in SVG Visual & only register shader properties upon... 86/96986/2
Adeel Kazmi [Thu, 10 Nov 2016 17:41:07 +0000 (17:41 +0000)]
Register Transform uniforms in SVG Visual & only register shader properties upon their creation

Fixes bug where SVG visuals are not being displayed. We are using the same shaders as in ImageVisual
so need to register the same uniforms.

Additionally, Image Shader properties only need to be registered upon creation rather than every time
we get the Shader.

Change-Id: Id74630ddb8e3beb34d582336172afae82fdf6db0

8 years agoRemoved VisualBase::RemoveAndReset() method. 71/96671/1
David Steele [Wed, 9 Nov 2016 18:32:36 +0000 (18:32 +0000)]
Removed VisualBase::RemoveAndReset() method.

This method is no longer required - in general, for new controls,
RegisterVisual will perform the required task of ensuring
SetOffStage() is called for visuals that get replaced.

Change-Id: I64ad3f527676ee875e8c622c536d446f0d9f04b7
Signed-off-by: David Steele <david.steele@samsung.com>
8 years agoRemoved SetOnStage/SetOffStage from visual-base.h 56/96356/3
David Steele [Tue, 8 Nov 2016 20:10:58 +0000 (20:10 +0000)]
Removed SetOnStage/SetOffStage from visual-base.h

Whereever SetOnStage/SetOffStage was used, have replaced with RegisterVisual instead.

Change-Id: I76d6df968dcd72a607ad593962a1a3318711a35c
Signed-off-by: David Steele <david.steele@samsung.com>
8 years agoInternalized VisualFactory::InitializeVisual templates 86/96086/5
David Steele [Mon, 7 Nov 2016 19:46:35 +0000 (19:46 +0000)]
Internalized VisualFactory::InitializeVisual templates

We don't want VisualBase::SetOnStage() or VisualBase::SetOffStage() to be
called from external header. This patch moves the InitializeVisual
templates internally, so that these APIs can be removed in a future patch.

Change-Id: I2cfbda4be518600d860692a840f8c195e17851e2
Signed-off-by: David Steele <david.steele@samsung.com>
8 years agoDisabling EmbossFilter now removes all render tasks. 55/96355/2
David Steele [Tue, 8 Nov 2016 17:16:27 +0000 (17:16 +0000)]
Disabling EmbossFilter now removes all render tasks.

Ensured all render tasks of EmbossFilter are removed when disabling the filter.
There should be no render tasks lying around, and they all get re-created if the
filter is re-enabled.

Fixed effects-view to ensure that AllocateResources actually allocates following a Disable, Enable pair.

Change-Id: I2172530b451ed86ce43cf944a90efd27f8f631fc
Signed-off-by: David Steele <david.steele@samsung.com>
8 years ago(GradientVisual) Turn BlendMode on renderer to OFF if using fully opaque colors 15/96315/3
Adeel Kazmi [Tue, 8 Nov 2016 11:56:57 +0000 (11:56 +0000)]
(GradientVisual) Turn BlendMode on renderer to OFF if using fully opaque colors

Change-Id: Ib5c0da3df30b42940254561315854f8f8ab12d87

8 years agoFix an errornous test case and corresponding wrong implementation in popup 85/96085/1
Kimmo Hoikka [Mon, 7 Nov 2016 18:44:07 +0000 (18:44 +0000)]
Fix an errornous test case and corresponding wrong implementation in popup

- test was assuming POPUP_BACKGROUND_IMAGE returns different URL in Get than what was set in Set

Change-Id: I1ad8046e1d10da1f3336cf0bb0c0b14563bca5c5

8 years agoMerge "Remove ResourceImages from Popup implementation" into devel/master
David Steele [Mon, 7 Nov 2016 16:20:59 +0000 (08:20 -0800)]
Merge "Remove ResourceImages from Popup implementation" into devel/master

8 years ago(Programming Guide) Updated Custom Control Creation section 12/94412/5
Adeel Kazmi [Fri, 28 Oct 2016 18:04:07 +0000 (19:04 +0100)]
(Programming Guide) Updated Custom Control Creation section

Also updated visual documentation.

Change-Id: Id796aef469c0649d18c0d8974ba293d27ccb5f30

8 years agoMerge "Revert the TextLabel to use the old renderer." into devel/master
Paul Wisbey [Mon, 7 Nov 2016 10:09:21 +0000 (02:09 -0800)]
Merge "Revert the TextLabel to use the old renderer." into devel/master

8 years agoRemove ResourceImages from Popup implementation 94/95794/1
Kimmo Hoikka [Fri, 4 Nov 2016 19:30:37 +0000 (19:30 +0000)]
Remove ResourceImages from Popup implementation

Change-Id: I3e3ef406a540e206df81c4cb12039a0293c69295

8 years agoCache NPatch textures 69/94869/13
Kimmo Hoikka [Tue, 1 Nov 2016 15:16:35 +0000 (15:16 +0000)]
Cache NPatch textures

- introduce NPatchLoader, a simple cache to store loaded N patches, their textures and metadata
- refactor NPatchVisual to use NPatchLoader and removed some dead / inefficient code

GL stat improvements in dali-demo

Before (only relevant numbers presented)
-----------------------------------------
INFO: DALI: OpenGL ES statistics sampled over 60 frames) operations per frame:
INFO: DALI:   Bind textures : Mean 109.17  (Min:107.00, Max:113.00, StdDev: 1.33, Actual:6550)
INFO: DALI: OpenGL ES Object Count:
INFO: DALI:   Texture Count : 101  (Peak:101)

After
-----------------------------------------
INFO: DALI: OpenGL ES statistics sampled over 60 frames) operations per frame:
INFO: DALI:   Bind textures : Mean 14.83  (Min:14.00, Max:15.00, StdDev: 0.37, Actual:890)
INFO: DALI: OpenGL ES Object Count:
INFO: DALI:   Texture Count : 8  (Peak:8)

Change-Id: I4ce84e6c6578c30660106950b40dd3bc0c41efa1

8 years agoMerge "Revert "Image and NPatch visual GetProperty returns url"" into devel/master
David Steele [Fri, 4 Nov 2016 15:34:19 +0000 (08:34 -0700)]
Merge "Revert "Image and NPatch visual GetProperty returns url"" into devel/master

8 years ago[dali_1.2.13] Merge branch 'devel/master' 70/95770/1
Tom Robinson [Fri, 4 Nov 2016 13:16:39 +0000 (13:16 +0000)]
[dali_1.2.13] Merge branch 'devel/master'

Change-Id: I2a13e4b4094795b2e21ac2504e24eabf1f251275

8 years agoDALi Version 1.2.13 66/95766/1 dali_1.2.13
Tom Robinson [Fri, 4 Nov 2016 13:14:46 +0000 (13:14 +0000)]
DALi Version 1.2.13

Change-Id: Id5ba2e78adf5f96c0cdcdf35aa0377826f35d226

8 years agoRevert the TextLabel to use the old renderer. 53/95753/1
Victor Cebollada [Fri, 4 Nov 2016 11:51:37 +0000 (11:51 +0000)]
Revert the TextLabel to use the old renderer.

Change-Id: Ib327c88d1ef97ecbd222ff7be649ae918af0fa89
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
8 years agoRevert "Image and NPatch visual GetProperty returns url" 50/95750/1
Agnelo Vaz [Fri, 4 Nov 2016 11:53:39 +0000 (11:53 +0000)]
Revert "Image and NPatch visual GetProperty returns url"

This reverts commit 4a0101828ec38e0cbdc450de769f11530044ea7f.

Change-Id: I8bda8ac00f5aac6cdcc6ee87df2f76f6494a5278

8 years agoImage and NPatch visual GetProperty returns url 01/95301/5
Agnelo Vaz [Wed, 2 Nov 2016 14:54:29 +0000 (14:54 +0000)]
Image and NPatch visual GetProperty returns url

Change-Id: I4d26e3332d6998e453bbdb6f66adb422743a3145

8 years agoMerge "DALi C# binding - Avoid removal of dali-swig/manual/cpp/keyboard_focus_manager...
dongsug song [Wed, 2 Nov 2016 12:01:20 +0000 (05:01 -0700)]
Merge "DALi C# binding - Avoid removal of dali-swig/manual/cpp/keyboard_focus_manager_wrap.cpp" into devel/master

8 years agoRemove incorrect placement actor from the RegisterVisual API 73/94873/2
Kimmo Hoikka [Tue, 1 Nov 2016 18:25:58 +0000 (18:25 +0000)]
Remove incorrect placement actor from the RegisterVisual API

Change-Id: Id3c608d85c64152b841087e0266ac9c43bc3591c

8 years agoMerge "Stop trying to find the URL parameter multiple times from property map" into...
Paul Wisbey [Tue, 1 Nov 2016 18:19:55 +0000 (11:19 -0700)]
Merge "Stop trying to find the URL parameter multiple times from property map" into devel/master

8 years agoStop trying to find the URL parameter multiple times from property map 65/94865/3
Kimmo Hoikka [Tue, 1 Nov 2016 14:25:38 +0000 (14:25 +0000)]
Stop trying to find the URL parameter multiple times from property map

- factory already needs to find it so no need for image visuals to do so

Change-Id: I2d4f50949b52c43c24d6220f539f25abf9fcad76

8 years agoMerge "Prevent Image visuals creating a renderer and putting it on stage even if...
Kimmo Hoikka [Tue, 1 Nov 2016 15:47:13 +0000 (08:47 -0700)]
Merge "Prevent Image visuals creating a renderer and putting it on stage even if url provided is empty" into devel/master

8 years agoMerge "Text - UNDERLINE, SHADOW, INPUT_UNDERLINE and INPUT_SHADOW properties refactor...
Paul Wisbey [Tue, 1 Nov 2016 14:40:45 +0000 (07:40 -0700)]
Merge "Text - UNDERLINE, SHADOW, INPUT_UNDERLINE and INPUT_SHADOW properties refactor." into devel/master

8 years agoPrevent Image visuals creating a renderer and putting it on stage even if url provide... 90/94390/7
Agnelo Vaz [Fri, 28 Oct 2016 13:28:20 +0000 (14:28 +0100)]
Prevent Image visuals creating a renderer and putting it on stage even if url provided is empty

Change-Id: I46751b4fbefe9e70a5a1e8da4d711c3038be8187

8 years agoMerge "Fixed bug in 3x3 NPatch shader and Color visual shader" into devel/master
Kimmo Hoikka [Tue, 1 Nov 2016 13:30:42 +0000 (06:30 -0700)]
Merge "Fixed bug in 3x3 NPatch shader and Color visual shader" into devel/master

8 years agoText - UNDERLINE, SHADOW, INPUT_UNDERLINE and INPUT_SHADOW properties refactor. 17/94217/10
Victor Cebollada [Thu, 27 Oct 2016 08:04:45 +0000 (09:04 +0100)]
Text - UNDERLINE, SHADOW, INPUT_UNDERLINE and INPUT_SHADOW properties refactor.

* These two properties are currently implemented with a json map encoded inside a string.
  This patch replaces this string by a property map.

Change-Id: I96c3c873bb2df69069d94d87fa29ef9de0d7db5b
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
8 years agoMerge "Text - FONT_STYLE and INPUT_FONT_STYLE properties refactor." into devel/master
Paul Wisbey [Tue, 1 Nov 2016 11:48:45 +0000 (04:48 -0700)]
Merge "Text - FONT_STYLE and INPUT_FONT_STYLE properties refactor." into devel/master

8 years agoText - FONT_STYLE and INPUT_FONT_STYLE properties refactor. 03/94003/10
Victor Cebollada [Wed, 26 Oct 2016 14:06:17 +0000 (15:06 +0100)]
Text - FONT_STYLE and INPUT_FONT_STYLE properties refactor.

* These two properties are currently implemented with a json map encoded inside a string.
  This patch replaces this string by a property map.

Change-Id: I8892d9067157c58f3d0b337e17fa6956b43b687d
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
8 years agoFixed bug in 3x3 NPatch shader and Color visual shader 09/94809/2
Ferran Sole [Tue, 1 Nov 2016 08:53:39 +0000 (08:53 +0000)]
Fixed bug in 3x3 NPatch shader and Color visual shader

Change-Id: Ice69e0f6220f9d5c6b7b968683c462451e4b3b41

8 years agoEmboss filter not to use Texture Set explictly 90/94590/2
Agnelo Vaz [Mon, 31 Oct 2016 17:23:35 +0000 (17:23 +0000)]
Emboss filter not to use Texture Set explictly

Change-Id: I830d6e7c96eed6c5d0d92f72f5e8b249c32213ae

8 years agoAdded position and size to Visuals 25/93325/35
Ferran Sole [Fri, 21 Oct 2016 14:59:29 +0000 (15:59 +0100)]
Added position and size to Visuals

Added properties and modified shaders to allow positioning and
sizing visuals inside Controls.

Supported visuals: border, color, gradient, image, nine-patch, primitive and mesh

Change-Id: I4addf71a344df0b18c288d0e0afc4d1a8a8595ad

8 years agoMerge "Text - Initialize the mUpdateCursorHookPosition member in the constructor...
Paul Wisbey [Fri, 28 Oct 2016 13:54:15 +0000 (06:54 -0700)]
Merge "Text - Initialize the mUpdateCursorHookPosition member in the constructor." into devel/master

8 years agoUpdate SWIG interface files to create binding for TextVisual and KeyInputFocusManager 93/94393/2
Richard Huang [Fri, 28 Oct 2016 13:38:07 +0000 (14:38 +0100)]
Update SWIG interface files to create binding for TextVisual and KeyInputFocusManager

Change-Id: I674c1d3eb1a0e8e01204308cbfd5fd8f5165afab

8 years agoDALi C# binding - Avoid removal of dali-swig/manual/cpp/keyboard_focus_manager_wrap.cpp 86/94386/1
Ravi Nanjundappa [Fri, 28 Oct 2016 13:19:38 +0000 (18:49 +0530)]
DALi C# binding - Avoid removal of dali-swig/manual/cpp/keyboard_focus_manager_wrap.cpp

Changes include removal of dali-swig/manual/cpp/keyboard_focus_manager_wrap.cpp when run
'make maintainer-clean' from build/tizen dir.

Change-Id: Ic982a9cffe9395d24b97d5fc8f311a131c085992
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
8 years agoMerge "Fix PageFactory to take in Texture rather than Image" into devel/master
Adeel Kazmi [Fri, 28 Oct 2016 13:21:11 +0000 (06:21 -0700)]
Merge "Fix PageFactory to take in Texture rather than Image" into devel/master

8 years ago[dali_1.2.12] Merge branch 'devel/master' 72/94372/1
Xiangyin Ma [Fri, 28 Oct 2016 12:18:58 +0000 (13:18 +0100)]
[dali_1.2.12] Merge branch 'devel/master'

Change-Id: Iee3fb16d4cd87c14f8d21214ed424ded75317336

8 years agoDALi Version 1.2.12 67/94367/1 dali_1.2.12
Xiangyin Ma [Fri, 28 Oct 2016 12:18:19 +0000 (13:18 +0100)]
DALi Version 1.2.12

Change-Id: Ic01a03ae4e5b393d1b4f2a86b7e90f62149269fd

8 years agoText - Initialize the mUpdateCursorHookPosition member in the constructor. 30/94230/1
Victor Cebollada [Thu, 27 Oct 2016 15:18:28 +0000 (16:18 +0100)]
Text - Initialize the mUpdateCursorHookPosition member in the constructor.

Change-Id: I9ebaa2d3d6760913753771bf51aef9528b850a73
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
8 years agoMerge "Added devel-api mirroring of public enumeration." into devel/master
Adeel Kazmi [Thu, 27 Oct 2016 15:02:02 +0000 (08:02 -0700)]
Merge "Added devel-api mirroring of public enumeration." into devel/master

8 years agoAdded Doxygen Comments and updated sample application 95/94195/1
shiva.jm [Thu, 27 Oct 2016 11:16:43 +0000 (16:46 +0530)]
Added Doxygen Comments and updated sample application

Change-Id: I35f6834d28dd83a430f78ea3775a9eae4e24d029
Signed-off-by: shiva.jm <shiva.jm@samsung.com>
8 years agoAdded devel-api mirroring of public enumeration. 14/94014/4
David Steele [Wed, 26 Oct 2016 18:00:21 +0000 (19:00 +0100)]
Added devel-api mirroring of public enumeration.

Used namespace alias to reduce implementation cruft.
Fixed one issue of namespace clashing within control-impl.

Change-Id: Ia02b3dd5717e0a7934f3d0887273c78bd08a7b80
Signed-off-by: David Steele <david.steele@samsung.com>
8 years agoFix PageFactory to take in Texture rather than Image 11/94011/3
Kimmo Hoikka [Wed, 26 Oct 2016 16:54:39 +0000 (17:54 +0100)]
Fix PageFactory to take in Texture rather than Image

Change-Id: Ie052ab83ec8be585c2e6caad1e2b4345a1321be3

8 years agoAdd High Level classes for Color, Size, Position 19/93719/4
shiva.jm [Wed, 26 Oct 2016 10:10:53 +0000 (15:40 +0530)]
Add High Level classes for Color, Size, Position

Change-Id: I9713750c2a405f7f1b3fa3fa586fb9130229fc93
Signed-off-by: shiva.jm <shiva.jm@samsung.com>
8 years agofixup! Adding the MISSING Animation constructor to accept duration in milli seconds 56/93856/5
Ravi Nanjundappa [Wed, 26 Oct 2016 06:51:22 +0000 (12:21 +0530)]
fixup! Adding the MISSING Animation constructor to accept duration in milli seconds

Inserted the code for Animation constructor which accept integer value for duration in milli seconds.
Example, _animation = new Animation(10000); will create Animation object with duration of 1000 ms (1s).
We can still use _animation = new Animation(1.0f); to create the same.
We can also use _animation.DurationMillSecs = 10000; // 10 ms

Also the Animation parameter pascal case change is handled in the animation class enums
Added looping property and Stop(Animation.EndAction action) also,

Change-Id: Idc52e3fc4c8a183bd9e72ccb2a6e0735dc161709
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
8 years agoMerge "DALi C# binding - Adding Animation constructor to accept duration in milli...
dongsug song [Wed, 26 Oct 2016 00:37:30 +0000 (17:37 -0700)]
Merge "DALi C# binding - Adding Animation constructor to accept duration in milli seconds" into devel/master

8 years agoMerge "Changed README to README.md" into devel/master
Adeel Kazmi [Tue, 25 Oct 2016 14:32:44 +0000 (07:32 -0700)]
Merge "Changed README to README.md" into devel/master

8 years agoDALi C# binding - Adding Animation constructor to accept duration in milli seconds 21/93421/3
Ravi Nanjundappa [Tue, 25 Oct 2016 14:26:32 +0000 (19:56 +0530)]
DALi C# binding - Adding Animation constructor to accept duration in milli seconds

Inserted the code for Animation constructor which accept integer value for duration in milli seconds.
Now, _animation = new Animation(10000); will create Animation object with duration of 1000 ms (1s).
We can still use _animation = new Animation(1.0f); to create the same.
We can also use _animation.DurationMillSecs = 10000; // 10 ms

Change-Id: Ie194280a9043f395d967f12b8835c66ae22c627f
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
8 years agoMerge "DALi C# binding - Follow Pascal case convention for enum members" into devel...
dongsug song [Tue, 25 Oct 2016 13:44:09 +0000 (06:44 -0700)]
Merge "DALi C# binding - Follow Pascal case convention for enum members" into devel/master

8 years agoMerge "DALi C# binding - change name of method, void SetVisible(bool visible) =...
dongsug song [Tue, 25 Oct 2016 13:43:28 +0000 (06:43 -0700)]
Merge "DALi C# binding - change name of method, void SetVisible(bool visible)  => Show()/Hide()" into devel/master

8 years agoMerge "Move Event Handlers to View class" into devel/master
dongsug song [Tue, 25 Oct 2016 13:38:21 +0000 (06:38 -0700)]
Merge "Move Event Handlers to View class" into devel/master

8 years agoMerge "DALi C# binding - adding property for Animation LoopCount and others." into...
dongsug song [Tue, 25 Oct 2016 13:35:27 +0000 (06:35 -0700)]
Merge "DALi C# binding - adding property for Animation LoopCount and others." into devel/master

8 years agoDALi C# binding - adding property for Animation LoopCount and others. 26/93526/4
Ravi Nanjundappa [Mon, 24 Oct 2016 16:11:54 +0000 (21:41 +0530)]
DALi C# binding - adding property for Animation LoopCount and others.

Implemented setters and getters for the property LoopCount in Animation Class
and the X,Y,W and H properties in RectInteger Class. Combined the opacity and
CurrentOpacity properties in Actor class. The properties Size(from Stage class)
and Visibility(from Actor class) are already present.

The Patch also contain the Changed order of the types in the generic parameters to
match the declaration in AnimateBy and AnimateTo APIs.

Change-Id: I8286f4ae19c40b3911e0d12f6874f7c2b184c26c
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
8 years agoChanged README to README.md 02/93702/3
Paul Wisbey [Tue, 25 Oct 2016 10:06:58 +0000 (11:06 +0100)]
Changed README to README.md

Change-Id: Ie868dcd64b497d17d7725459c1badf5450981acd

8 years agoDALi C# binding - Follow Pascal case convention for enum members 36/93636/4
Ravi Nanjundappa [Tue, 25 Oct 2016 06:32:52 +0000 (12:02 +0530)]
DALi C# binding - Follow Pascal case convention for enum members

Created a new namespace called Dali.Constants and wrapped the
AlphaFunction.BuiltinFunction enum. Added a new constructor to cope
with this change.
hello-world.cs is also modified accordingly.

Change-Id: I86f9b079920c65f531d4175366af8578b61ccb5c
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
8 years agoDALi C# binding - change name of method, void SetVisible(bool visible) => Show(... 28/93428/2
Ravi Nanjundappa [Tue, 25 Oct 2016 06:59:44 +0000 (12:29 +0530)]
DALi C# binding - change name of method, void SetVisible(bool visible)  => Show()/Hide()

Inserted the code Show()/Hide() into Actor class.
Now, instead of SetVisible(true) we can use Show() and for SetVisible(false) we can use Hide().

Change-Id: Ib261160e89d274cfc54ca81963c151322e4d88cb
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
8 years agoMerge "Update the refined dali c# application to support more argument options" into...
dongsug song [Tue, 25 Oct 2016 03:50:51 +0000 (20:50 -0700)]
Merge "Update the refined dali c# application to support more argument options" into devel/master

8 years agoMerge "Added bezier curve control points to TransitionData" into devel/master
Adeel Kazmi [Mon, 24 Oct 2016 16:19:37 +0000 (09:19 -0700)]
Merge "Added bezier curve control points to TransitionData" into devel/master

8 years agoRename Eden to Focus 44/93444/3
Umar [Mon, 24 Oct 2016 09:38:59 +0000 (10:38 +0100)]
Rename Eden to Focus

Change-Id: I393ef82c0850461bee08b81f06a547ade4222b85

8 years agoMerge "Added support for C# operators on DALi handle objects" into devel/master
Adeel Kazmi [Mon, 24 Oct 2016 10:24:21 +0000 (03:24 -0700)]
Merge "Added support for C# operators on DALi handle objects" into devel/master

8 years agoMerge "DALi C# binding - Change Animte APIs to use values instead of DALi properties...
dongsug song [Mon, 24 Oct 2016 10:07:42 +0000 (03:07 -0700)]
Merge "DALi C# binding - Change Animte APIs to use values instead of DALi properties" into devel/master

8 years agoMove Event Handlers to View class 43/93143/3
puru [Mon, 24 Oct 2016 07:49:49 +0000 (13:19 +0530)]
Move Event Handlers to View class

This patch moves event handlers from actor class to view class.
Events are added to test the functionality of View EventHandlers.

Change-Id: Ifee2bd2e7266eec3a6eef9fc9ec88289c3f3562e
Signed-off-by: puru <puru.dharma@samsung.com>
8 years agoMerge "Fix for a single line text's vertical alignment." into devel/master
Paul Wisbey [Fri, 21 Oct 2016 16:24:21 +0000 (09:24 -0700)]
Merge "Fix for a single line text's vertical alignment." into devel/master

8 years agoAdded bezier curve control points to TransitionData 30/93330/1
David Steele [Fri, 21 Oct 2016 14:18:24 +0000 (15:18 +0100)]
Added bezier curve control points to TransitionData

Allows stylesheets to specify alpha functions for transitions
using bezier control points in addition to the builtin easing functions.

Change-Id: I2f407b8692384ea89ba3bea112cce8ea391f2545
Signed-off-by: David Steele <david.steele@samsung.com>
8 years agoAdded support for C# operators on DALi handle objects 70/92970/20
Nick Holland [Wed, 19 Oct 2016 13:34:43 +0000 (14:34 +0100)]
Added support for C# operators on DALi handle objects

Now have the ability to do operations such as

if ( actor )  // test if the C# actor object is valid and the actor isn't just any empty handle

if ( !actor )

if ( actor && anotherActor )

if ( actor || anotherActor )

Change-Id: I31dd56e89f1d4c7d056f56b52717cef469a76afb

8 years agoFix for a single line text's vertical alignment. 26/93326/2
Victor Cebollada [Fri, 21 Oct 2016 14:57:11 +0000 (15:57 +0100)]
Fix for a single line text's vertical alignment.

* Use case:
  - A TextField with the vertical alignment set to CENTER.
  - Add some text. It's correctly aligned.
  - Remove some text with the back space. It aligns the text to the TOP

Change-Id: I5c8c6f2bd81d8f78ba5ec2835c1e55531cb99a77
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
8 years agoMerge "TextVisual - Fix a memory leak issue." into devel/master
Paul Wisbey [Fri, 21 Oct 2016 15:22:33 +0000 (08:22 -0700)]
Merge "TextVisual - Fix a memory leak issue." into devel/master

8 years agoMerge "DALi Version 1.2.11" into devel/master
Adeel Kazmi [Fri, 21 Oct 2016 14:14:30 +0000 (07:14 -0700)]
Merge "DALi Version 1.2.11" into devel/master

8 years ago[dali_1.2.11] Merge branch 'devel/master' 18/93318/1
Nick Holland [Fri, 21 Oct 2016 14:09:50 +0000 (15:09 +0100)]
[dali_1.2.11] Merge branch 'devel/master'

Change-Id: Id16261260dfdcb426a608977fb04729c75bba74c

8 years agoDALi Version 1.2.11 14/93314/1 dali_1.2.11
Nick Holland [Fri, 21 Oct 2016 14:08:55 +0000 (15:08 +0100)]
DALi Version 1.2.11

Change-Id: I7b48c29461526ba5f65e8396bd162f3811338f5b

8 years agoTextVisual - Fix a memory leak issue. 94/93294/2
Victor Cebollada [Fri, 21 Oct 2016 12:49:47 +0000 (13:49 +0100)]
TextVisual - Fix a memory leak issue.

Change-Id: I06def29578a38fabdffc226fb774056bbc52fe1b
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
8 years agoRemove incorrect empty Actor handle parameter from Visuals DoInitialize 78/93178/7
Kimmo Hoikka [Thu, 20 Oct 2016 18:07:57 +0000 (19:07 +0100)]
Remove incorrect empty Actor handle parameter from Visuals DoInitialize

Change-Id: Ie3634c6d2f0ac8275b34825520cfed9b5af7726c

8 years agoDALi C# binding - Change Animte APIs to use values instead of DALi properties 89/92589/7
Ravi Nanjundappa [Mon, 17 Oct 2016 12:53:54 +0000 (18:23 +0530)]
DALi C# binding - Change Animte APIs to use values instead of DALi properties

- Injected the code using swig typemap to change the animate apis to make use of values instead of DALi properties.
- Modified hello-world.cs file to reflect these changes.

Earlier Usage :
_animation.AnimateTo(new Property(_text, Actor.Property.ORIENTATION), new Property.Value(new Quaternion( new Radian( new Degree( 180.0f ) ) ...)

New Usage :
_animation.AnimateTo(_text, Animation.ORIENTATION, new Quaternion( new Radian( new Degree( 180.0f ) ) ...)

Change-Id: Icf11007231f34708071b17e8ebca9d512cbc25c2
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
8 years agoMerge "Reducesd image visual memory consumption by removing unnecessary fragment...
David Steele [Fri, 21 Oct 2016 10:54:54 +0000 (03:54 -0700)]
Merge "Reducesd image visual memory consumption by removing unnecessary fragment shader string and TextureSet member" into devel/master

8 years agoMerge "Added code for stylable transitions" into devel/master
Adeel Kazmi [Fri, 21 Oct 2016 10:34:10 +0000 (03:34 -0700)]
Merge "Added code for stylable transitions" into devel/master

8 years agoReducesd image visual memory consumption by removing unnecessary fragment shader... 75/93175/3
Kimmo Hoikka [Thu, 20 Oct 2016 16:01:11 +0000 (17:01 +0100)]
Reducesd image visual memory consumption by removing unnecessary fragment shader string and TextureSet member

Change-Id: I54fe025677758306400f26b2f24874f8c938d920

8 years agoAdded code for stylable transitions 96/90596/11
David Steele [Fri, 30 Sep 2016 18:44:06 +0000 (19:44 +0100)]
Added code for stylable transitions

This change enables animatable properties of placement actors/renderers
to be animated using a property map defined by a style sheet.

New classes:
VisualProperty - a version of Property that doesn't use C++ references
TransitionData - a pimpled struct that carries enough information to generate
Animators that can be defined by Animation::AnimateTo().

Additions:
Added a name to visual base to enable the animator to target a named
visual.

Added GetVisualProperty() internal method which checks the named visual
(or it's placement actor) for the given property, and returns the appropriate
VisualProperty that can animate it.

Change-Id: I0c91eae845b0ba5be5d7829babee75717f2b3b49
Signed-off-by: David Steele <david.steele@samsung.com>
8 years agoMerge "C# First Screen demo" into devel/master
Kimmo Hoikka [Thu, 20 Oct 2016 15:22:29 +0000 (08:22 -0700)]
Merge "C# First Screen demo" into devel/master

8 years agoMerge "Added New methods to cater for second step initialization" into devel/master
Kimmo Hoikka [Thu, 20 Oct 2016 15:14:53 +0000 (08:14 -0700)]
Merge "Added New methods to cater for second step initialization" into devel/master

8 years agoMerge "Remove Atlas usage from ImageVisual" into devel/master
Adeel Kazmi [Thu, 20 Oct 2016 15:14:21 +0000 (08:14 -0700)]
Merge "Remove Atlas usage from ImageVisual" into devel/master

8 years agoC# First Screen demo 65/86265/26
Umar [Wed, 31 Aug 2016 09:10:42 +0000 (10:10 +0100)]
C# First Screen demo

Change-Id: I5b75e7af9b5754c530c6fd54a58939fe1b58f430

8 years agoRemove Atlas usage from ImageVisual 75/92975/4
Kimmo Hoikka [Wed, 19 Oct 2016 16:09:52 +0000 (17:09 +0100)]
Remove Atlas usage from ImageVisual

- Remove Atlas usage
- Refactor the code to reuse CreateRenderer and CreateTextureSet

Change-Id: Ifd06e56192ffcae1749b3d2d6b4f566a9f58d73a

8 years agoAdded New methods to cater for second step initialization 80/92980/4
Adeel Kazmi [Wed, 19 Oct 2016 16:21:06 +0000 (17:21 +0100)]
Added New methods to cater for second step initialization

Change-Id: Ib487d11e1fdb114eaa3fdf0b3ab438da523c46f6

8 years agoMerge "TextVisual implementation." into devel/master
Paul Wisbey [Thu, 20 Oct 2016 09:06:39 +0000 (02:06 -0700)]
Merge "TextVisual implementation." into devel/master

8 years agoMerge "Convert the Underline and Shadow deprecated APIs to the new ones." into devel...
Paul Wisbey [Thu, 20 Oct 2016 09:06:30 +0000 (02:06 -0700)]
Merge "Convert the Underline and Shadow deprecated APIs to the new ones." into devel/master

8 years agoMerge "TextController refactor." into devel/master
Paul Wisbey [Thu, 20 Oct 2016 09:06:04 +0000 (02:06 -0700)]
Merge "TextController refactor." into devel/master

8 years agoChange SvgVisual to use Texture instead of Atlas 08/92908/4
Kimmo Hoikka [Wed, 19 Oct 2016 09:48:47 +0000 (10:48 +0100)]
Change SvgVisual to use Texture instead of Atlas

Change-Id: Iaf47938f22e4cc11722b8aacdc144fb59338ea2d

8 years ago(Visuals) Remove dead code & redundant Get prefix to check if on stage or from the... 24/92624/3
Adeel Kazmi [Mon, 17 Oct 2016 15:26:26 +0000 (16:26 +0100)]
(Visuals) Remove dead code & redundant Get prefix to check if on stage or from the cache

- SetImage always called on initialisation now so checking if we have a renderer is not needed

Change-Id: I5f767a3a4065af7992eda6329c2a1436583a4114

8 years agoTextVisual implementation. 15/92615/3
Victor Cebollada [Mon, 17 Oct 2016 14:14:51 +0000 (15:14 +0100)]
TextVisual implementation.

Change-Id: I13a0efb3c32b5969cbf6008f82d42d9064f915df
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
8 years agoConvert the Underline and Shadow deprecated APIs to the new ones. 12/92612/1
Victor Cebollada [Mon, 17 Oct 2016 13:51:57 +0000 (14:51 +0100)]
Convert the Underline and Shadow deprecated APIs to the new ones.

This needs to be done to pass the UTC in the TextVisual patch currently in developement.

Change-Id: I517fba6b78115d9bf77ea0998c54e500475102a6
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
8 years agoTextController refactor. 93/90593/6
Victor Cebollada [Fri, 30 Sep 2016 15:52:39 +0000 (16:52 +0100)]
TextController refactor.

* A different control interface has been created for the editable text controls.
  The text label doesn't need to implement the methods AddDecoration(),
  TextChanged(), MaxLengthReached() and InputStyleChanged().

Change-Id: I803729d7d502b03923bae5744af887d8cfe84b57
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
8 years agoMerge "RegisterVisuals has option not to auto stage visual" into devel/master
Adeel Kazmi [Fri, 14 Oct 2016 16:21:06 +0000 (09:21 -0700)]
Merge "RegisterVisuals has option not to auto stage visual" into devel/master

8 years agoRegisterVisuals has option not to auto stage visual 71/92171/10
Agnelo Vaz [Thu, 13 Oct 2016 10:30:32 +0000 (11:30 +0100)]
RegisterVisuals has option not to auto stage visual

Currenly RegisterVisual stages it too. This may not always be desirable hence offering second API.
Adding EnableVisual API

Change-Id: Id4f54bf3f19ac8a650f0db21d3fc62efda60092f

8 years ago[dali_1.2.10] Merge branch 'devel/master' 34/92334/1
Richard Huang [Fri, 14 Oct 2016 13:17:40 +0000 (14:17 +0100)]
[dali_1.2.10] Merge branch 'devel/master'

Change-Id: I32af1e08fd12cf1ded6ce557ed34ec8f0b182d67

8 years agoDALi Version 1.2.10 30/92330/1 dali_1.2.10
Richard Huang [Fri, 14 Oct 2016 13:16:59 +0000 (14:16 +0100)]
DALi Version 1.2.10

Change-Id: I811626a78fd1cc3427c2d3ec4f49d25e9005eaac

8 years agoImageVisual postpones adding renderer to actor until image is loaded 62/88562/16
Xiangyin Ma [Mon, 19 Sep 2016 17:09:31 +0000 (18:09 +0100)]
ImageVisual postpones adding renderer to actor until image is loaded

Change-Id: Id219a0f0ca7bc67f11f8dcda9126d97f3bb07d51

8 years agoC# property script modified to support View control remame 17/92017/4
Nick Holland [Wed, 12 Oct 2016 14:50:15 +0000 (15:50 +0100)]
C# property script modified to support View control remame

Now how a look up table to support renaming
of C++ classes in to C#.
E.g. Control -> View

Change-Id: I6cc071792909e3e1cd12e13f15268faf0deb859b