platform/core/uifw/dali-toolkit.git
7 years agoMerge "Text - Fix for input style when the text gain the focus via KeyboardFocusGainE...
Paul Wisbey [Mon, 21 Nov 2016 15:57:34 +0000 (07:57 -0800)]
Merge "Text - Fix for input style when the text gain the focus via KeyboardFocusGainEvent()." into devel/master

7 years agoAdd Privilege doxygen tag about URL 17/98417/4
Seoyeon Kim [Thu, 17 Nov 2016 07:42:30 +0000 (16:42 +0900)]
Add Privilege doxygen tag about URL

- To access to internet, media storage, and external storage in Tizen,
 the user has to add the privileges.

Change-Id: I740227b1e1d0b463fce35755ab272a6749d8b543
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
7 years agoMerge "Usage of CustomeView for ScrollContainer and code refactoring accordingly...
Kimmo Hoikka [Fri, 18 Nov 2016 15:09:07 +0000 (07:09 -0800)]
Merge "Usage of CustomeView for ScrollContainer and code refactoring accordingly. Also added monodevelop solution and project files." into devel/master

7 years agoMerge "DALi Version 1.2.15" into devel/master
Adeel Kazmi [Fri, 18 Nov 2016 11:36:10 +0000 (03:36 -0800)]
Merge "DALi Version 1.2.15" into devel/master

7 years agoDALi Version 1.2.15 28/98728/1 dali_1.2.15
Umar [Fri, 18 Nov 2016 10:58:32 +0000 (10:58 +0000)]
DALi Version 1.2.15

Change-Id: Ie7fe8611880a607a5d62b76b37ed48337577a94d

7 years agoText - Fix for input style when the text gain the focus via KeyboardFocusGainEvent(). 95/98695/1
Victor Cebollada [Fri, 18 Nov 2016 08:30:20 +0000 (08:30 +0000)]
Text - Fix for input style when the text gain the focus via KeyboardFocusGainEvent().

* The input style was not updated.

Change-Id: Ibf8f0211b3bcc81f49399f0358368555cf0756d5
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
7 years agoMerge "Garbage Collection using Dispose Queue method" into devel/master
dongsug song [Fri, 18 Nov 2016 04:01:08 +0000 (20:01 -0800)]
Merge "Garbage Collection using Dispose Queue method" into devel/master

7 years agoUsage of CustomeView for ScrollContainer and code refactoring accordingly. Also added... 13/94413/8
Umar [Fri, 28 Oct 2016 18:48:40 +0000 (19:48 +0100)]
Usage of CustomeView for ScrollContainer and code refactoring accordingly. Also added monodevelop solution and project files.

Change-Id: Ib2aeca064231820888d263c3d2b852c688f9f7e4

7 years agoMerge "Text - Fix for input style when there is a long press event." into devel/master
Adeel Kazmi [Thu, 17 Nov 2016 16:31:56 +0000 (08:31 -0800)]
Merge "Text - Fix for input style when there is a long press event." into devel/master

7 years agoGarbage Collection using Dispose Queue method 04/90804/19
shiva.jm [Fri, 28 Oct 2016 10:09:58 +0000 (15:39 +0530)]
Garbage Collection using Dispose Queue method

Change-Id: If9896902e86d6925a0bb4a04610f161f3e441f9b
Signed-off-by: shiva.jm <shiva.jm@samsung.com>
7 years agoAdded transform properties to wireframe visual 47/98547/1
Ferran Sole [Thu, 17 Nov 2016 12:52:18 +0000 (12:52 +0000)]
Added transform properties to wireframe visual

* Use transform properties on the wireframe visual shader
* Set transform properties to wireframe visuals when debug rendering enabled

Change-Id: Ia50f8d8d3111ce08e08166204d090a8684d20107

7 years agoMerge "Cleanup of Visual::Base::SetSize" into devel/master
Adeel Kazmi [Thu, 17 Nov 2016 12:09:46 +0000 (04:09 -0800)]
Merge "Cleanup of Visual::Base::SetSize" into devel/master

7 years agoText - Fix for input style when there is a long press event. 12/98512/1
Victor Cebollada [Thu, 17 Nov 2016 11:49:55 +0000 (11:49 +0000)]
Text - Fix for input style when there is a long press event.

* The input style was not updated.

Change-Id: I5758ee06739e2c1d28b62cb6d492c6f9bddf0b78
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
7 years agoCleanup of Visual::Base::SetSize 82/96982/7
David Steele [Thu, 10 Nov 2016 16:07:46 +0000 (16:07 +0000)]
Cleanup of Visual::Base::SetSize

Removed SetSize/GetSize from Visual::Base
Added SetTransformAndSize() which should be called from either parent
control's OnSizeSet or OnRelayout.
Added method Visual::Base::Impl::Data::GetVisualSize() to calculate event side
size of visual from transform and control size.

Changed SvgVisual::New() to remove incorrect ImageSize. Instead, uses new visual
size.

Updated Internal::Control::OnSizeSet to ensure that the background visual has
a size set to fill the control

Test Harness
------------
Fixed the event thread callback stub to ensure a 30 second timeout instead of
waiting indefinitely.
Updated test cases to ensure that GetClosestImageSize() is set for visuals under
test that require a size in order to pretend to load something; updated test cases
to ensure that ImageView's added to Stage have a size (to pretend to load something)
Updated dummy-control to handle OnRelayout, and to call SetTransformAndSize on all
registered visuals.

Change-Id: I932293adbd117c242704074229c317a51f9a55c0
Signed-off-by: David Steele <david.steele@samsung.com>
7 years agoMerge "More SVACE fixes" into devel/master
Adeel Kazmi [Thu, 17 Nov 2016 10:13:17 +0000 (02:13 -0800)]
Merge "More SVACE fixes" into devel/master

7 years agoMerge "(KeyboardFocusManager) Fixed ConnectSignal handling & SVACE error" into devel...
Adeel Kazmi [Thu, 17 Nov 2016 10:13:10 +0000 (02:13 -0800)]
Merge "(KeyboardFocusManager) Fixed ConnectSignal handling & SVACE error" into devel/master

7 years agoRevert patchset "DALi C# Tizen GBS build:" 76/98276/2
dongsug.song [Thu, 17 Nov 2016 01:05:51 +0000 (10:05 +0900)]
Revert patchset "DALi C# Tizen GBS build:"

- revert patchset "DALi C# Tizen GBS build:(9964b9954548577400b6bda85d96d8d599046c6e)".
- originally, there was agreement to make Dali c# binding codes be generated automatically by SWIG.
- on devel/master branch, automatic C# codes will be generated by SWIG.
- on tizen branch, there is some restriction of GBS build, C# binding codes will be updated mannually.

Change-Id: Ifdb3cb47f979e9379a8f34d89f161d156cc8a4d0
Signed-off-by: dongsug.song <dongsug.song@samsung.com>
7 years agoMore SVACE fixes 53/98253/2
Adeel Kazmi [Wed, 16 Nov 2016 14:23:33 +0000 (14:23 +0000)]
More SVACE fixes

Change-Id: I3f912024ba53d612af0a41141b4afa64c79d7ad1

7 years ago(KeyboardFocusManager) Fixed ConnectSignal handling & SVACE error 62/98262/1
Adeel Kazmi [Wed, 16 Nov 2016 17:43:37 +0000 (17:43 +0000)]
(KeyboardFocusManager) Fixed ConnectSignal handling & SVACE error

Change-Id: Ic6893d38d9b957d41f9e4cdf287c7eb40e32433f

7 years agoMerge "C# CustomView Implementation (C++ wrappers, manual bindings, C# wrappers)...
David Steele [Wed, 16 Nov 2016 11:17:25 +0000 (03:17 -0800)]
Merge "C# CustomView Implementation (C++ wrappers, manual bindings, C# wrappers)" into devel/master

7 years agoFix various SVACE errors 05/98005/5
Adeel Kazmi [Tue, 15 Nov 2016 15:35:14 +0000 (15:35 +0000)]
Fix various SVACE errors

Change-Id: I9bef1e40dbcd4a5feb8bf518ade181e5e9d08cdb

7 years agoMerge "Visual bases checks if visual already staged before adding to stage" into...
Adeel Kazmi [Tue, 15 Nov 2016 15:40:36 +0000 (07:40 -0800)]
Merge "Visual bases checks if visual already staged before adding to stage" into devel/master

7 years agoC# CustomView Implementation (C++ wrappers, manual bindings, C# wrappers) 36/92636/23
Umar [Mon, 17 Oct 2016 17:42:20 +0000 (18:42 +0100)]
C# CustomView Implementation (C++ wrappers, manual bindings, C# wrappers)

Change-Id: I153b2861af8315ccdc64d01c5998790966213dc3

7 years agoVisual bases checks if visual already staged before adding to stage 93/97593/4
Agnelo Vaz [Mon, 14 Nov 2016 20:17:08 +0000 (20:17 +0000)]
Visual bases checks if visual already staged before adding to stage

Fixes bug in which a stage visual can be staged again, caused a new renderer to be created and lost the handle to prevous renderer.
  Meant stray renderers could exist in the control. Leak!

Visual bases checks if visual already staged before adding to stage Fixes bug in which a staged visual can be staged again, caused a new renderer to be created and lost the handle to previous renderer. Meant stray a renderer could exist in the control. Leak! Can occur in control development or with direct use of Visual::SetOnStage. Control Example. Button:Setup { register visual A register visual B } Button::OnStageConnection { enable visual A (call 1) enable visual B Control::OnStageConnection; (call 2) } Call 1 initializes a renderer and puts it on stage. Call 2 initializes and puts on stage all registered visuals without checking if already staged.

Logging in control increased

Change-Id: I98383cac66e833b13765d8aef88767a3e09946b2

7 years agoMerge "Dali C# binding : Creating Color Constructor to accept enum Colors" into devel...
dongsug song [Tue, 15 Nov 2016 06:50:28 +0000 (22:50 -0800)]
Merge "Dali C# binding : Creating Color Constructor to accept enum Colors" into devel/master

7 years agoMerge "(Automated Tests) Sync with core tests" into devel/master
Kimmo Hoikka [Mon, 14 Nov 2016 18:58:20 +0000 (10:58 -0800)]
Merge "(Automated Tests) Sync with core tests" into devel/master

7 years agoControl impl just uses Visual Registration instead of a visual member variable 54/97254/3
Agnelo Vaz [Fri, 11 Nov 2016 14:57:07 +0000 (14:57 +0000)]
Control impl just uses Visual Registration instead of a visual member variable

Previously control-impl registered a backgrounf visual but also kept a handle to it as member variable.

Now GetVisual is called when the background visual is needed.  The member handle is removed.
Passing an empty map for SetProperty( Property::BACKGROUND ) unregisters and removes the background visual

Change-Id: Iff835223e67b96f4cbaaf5296a30fb4cb404981d

7 years agoAdded correct import defines to SyncImageLoader 25/97525/2
Tom Robinson [Mon, 14 Nov 2016 10:52:06 +0000 (10:52 +0000)]
Added correct import defines to SyncImageLoader

Change-Id: I298895d6b571269f3bae7015227fc6a96cc01c0e

7 years ago(Automated Tests) Sync with core tests 55/97255/3
Adeel Kazmi [Fri, 11 Nov 2016 17:39:04 +0000 (17:39 +0000)]
(Automated Tests) Sync with core tests

Change-Id: I536c8e625567103fb073a7d94d5e0c2e6d6516e8

7 years agoMerge "DALi Version 1.2.14" into devel/master
Adeel Kazmi [Fri, 11 Nov 2016 18:45:38 +0000 (10:45 -0800)]
Merge "DALi Version 1.2.14" into devel/master

7 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

7 years agoMerge "Control::UnregisterVisual does not remove renderers from actor" into devel...
Adeel Kazmi [Fri, 11 Nov 2016 17:38:00 +0000 (09:38 -0800)]
Merge "Control::UnregisterVisual does not remove renderers from actor" into devel/master

7 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

7 years agoControl::UnregisterVisual does not remove renderers from actor 04/97204/2
Agnelo Vaz [Fri, 11 Nov 2016 11:42:01 +0000 (11:42 +0000)]
Control::UnregisterVisual does not remove renderers from actor

Adding test to prove renderer is removed when removing a visual from the stage (via it's control).

Change-Id: I15442793e7715ba7b1c7660b306919be6bd9be1d

7 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

7 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>
7 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>
7 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>
7 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>
7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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>
7 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

7 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

7 years agoDali C# binding : Creating Color Constructor to accept enum Colors 35/95235/2
Emil Abraham [Wed, 2 Nov 2016 13:10:29 +0000 (18:40 +0530)]
Dali C# binding : Creating Color Constructor to accept enum Colors

The Color class takes a string in the constructor, so it cannot check
whether the string represents a valid color. Here we define constants for
these colors as enum, so that it can do this check during compilation.

Now we can use stage.BackgroundColor =  new Color(Colors.White); instead of
stage.BackgroundColor =  new Color("white");

Change-Id: I135e4103d6f9171011ed9d4e60f486a3e237d6cd
Signed-off-by: Emil Abraham <emil.abraham@samsung.com>
7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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

7 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>
7 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

7 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>
7 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

7 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

7 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

7 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

7 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

7 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>
7 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

7 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

7 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>
7 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

7 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>
7 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>
7 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

7 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>
7 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>
7 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

7 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

7 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>
7 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

7 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

7 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

7 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

7 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>
7 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

7 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>
7 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>
7 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

7 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

7 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

7 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

7 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

7 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>
7 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

7 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>
7 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

7 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>
7 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