platform/core/uifw/dali-toolkit.git
8 years agoMerge "Automatically update doxygen configuration to local version." into devel/master
Adeel Kazmi [Wed, 30 Nov 2016 09:17:33 +0000 (01:17 -0800)]
Merge "Automatically update doxygen configuration to local version." into devel/master

8 years agoAutomatically update doxygen configuration to local version. 89/100289/3
Francisco Santos [Tue, 29 Nov 2016 15:55:09 +0000 (15:55 +0000)]
Automatically update doxygen configuration to local version.

Change-Id: Ic8dce09ea34366e00ff18a8a9935c4594896e25c

8 years agoMerge "Control - Trigger the size negotiation when the background is updated." into...
David Steele [Tue, 29 Nov 2016 16:08:47 +0000 (08:08 -0800)]
Merge "Control - Trigger the size negotiation when the background is updated." into devel/master

8 years agoMerge "TextVisual - Renderer life cycle." into devel/master
David Steele [Tue, 29 Nov 2016 16:08:11 +0000 (08:08 -0800)]
Merge "TextVisual - Renderer life cycle." into devel/master

8 years agoControl - Trigger the size negotiation when the background is updated. 39/100239/11
Victor Cebollada [Fri, 25 Nov 2016 10:27:35 +0000 (10:27 +0000)]
Control - Trigger the size negotiation when the background is updated.

* It may be needed by the new visual to relayout its contents. i.e TextVisual needs it.

Change-Id: I04498ed72b2ef94cccc2b3135adb66f5d2862e2d
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
8 years agoTextVisual - Renderer life cycle. 64/100164/10
Victor Cebollada [Fri, 25 Nov 2016 07:29:56 +0000 (07:29 +0000)]
TextVisual - Renderer life cycle.

* Creates the renderer as soon as the visual is on the stage,
  otherwise flags are not set/updated. Create the renderer
  even there is no text or the area's size is zero.
* Only destroys the renderer when the visual is off the stage.
  Do not destroy the renderer if there is no text or the area's
  size is zero.

Change-Id: I6d621399767dd7a603e758d59850d9f6ad1c81f1
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
8 years agoMerge "Dali C# binding - Implement the pure C# classes" into devel/master
dongsug song [Tue, 29 Nov 2016 11:02:32 +0000 (03:02 -0800)]
Merge "Dali C# binding - Implement the pure C# classes" into devel/master

8 years agoDali C# binding - Implement the pure C# classes 52/99652/6
Emil Abraham [Wed, 23 Nov 2016 12:07:07 +0000 (17:37 +0530)]
Dali C# binding - Implement the pure C# classes

Implementation of Pure high-level C# classes and use
C#'s implicit convertion operators to covert from
C# Color, Position & Size classes to Dali Vector4,
Vector3 and Vector2 classes.

Change-Id: I6a68268c8e1511697479ca9f94356961bca5a7bd
Signed-off-by: Emil Abraham <emil.abraham@samsung.com>
8 years agoChanged bubble effect to use new texture API 85/99985/8
Ferran Sole [Thu, 24 Nov 2016 14:52:51 +0000 (14:52 +0000)]
Changed bubble effect to use new texture API

* Bubble effect uses new texture API
* Removed unneded actors

Change-Id: I2a682599928e118194c399417990ec7b417fba99

8 years agoMerge "Added API flags into the control-wrapper files." into devel/master
dongsug song [Sun, 27 Nov 2016 13:03:00 +0000 (05:03 -0800)]
Merge "Added API flags into the control-wrapper files." into devel/master

8 years agoAdded API flags into the control-wrapper files. 70/99970/7
Umar [Thu, 24 Nov 2016 13:54:39 +0000 (13:54 +0000)]
Added API flags into the control-wrapper files.

This also fixed the issue of C# demo not working when the native code is compiled in the Release mode.

Change-Id: I1383547b1ede031870533707ec0093dc867cab49

8 years ago(ImageView) Use Relayout method rather than OnSizeSet 97/100297/2
Adeel Kazmi [Fri, 25 Nov 2016 17:57:11 +0000 (17:57 +0000)]
(ImageView) Use Relayout method rather than OnSizeSet

We shouldn't rely on the OnSizeSet method as the size specified in this could
be different when our size is negotiated.

Change-Id: Iaca7de5b8641eb953ab3de312561d6feee61182c

8 years agoMerge "Revert public API changes. BATCH property." into devel/master
Adeel Kazmi [Fri, 25 Nov 2016 13:51:41 +0000 (05:51 -0800)]
Merge "Revert public API changes. BATCH property." into devel/master

8 years agoMerge "Change Internal::Control destructor to protected" into devel/master
Adeel Kazmi [Fri, 25 Nov 2016 11:00:32 +0000 (03:00 -0800)]
Merge "Change Internal::Control destructor to protected" into devel/master

8 years agoMerge "DALi Version 1.2.16" into devel/master
Paul Wisbey [Fri, 25 Nov 2016 09:33:27 +0000 (01:33 -0800)]
Merge "DALi Version 1.2.16" into devel/master

8 years agoRevert public API changes. BATCH property. 14/98114/6
Victor Cebollada [Tue, 15 Nov 2016 17:49:53 +0000 (17:49 +0000)]
Revert public API changes. BATCH property.

* Use the BATCH property from the devel API.

Change-Id: I4f7b006c85859058a27a7a515f802c4906c8d2af
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
8 years agoFix build issue of DALi# 39/100139/1
Ravi Nanjundappa [Fri, 25 Nov 2016 07:16:49 +0000 (12:46 +0530)]
Fix build issue of DALi#

This patch fixes the build issue of DALi#.
Need to create automatic/csharp dir manually
to avoid the build issue.

Change-Id: Ie00cbc82ac8aa2a86533ccdc4afcbcc885a02623
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
8 years agoDALi Version 1.2.16 40/100140/1 dali_1.2.16
Victor Cebollada [Fri, 25 Nov 2016 07:06:11 +0000 (07:06 +0000)]
DALi Version 1.2.16

Change-Id: I9c8fd6c6399dcb5f3b7ec0e464776f988d29393d

8 years agoChange Internal::Control destructor to protected 20/100020/1
Adeel Kazmi [Thu, 24 Nov 2016 17:43:40 +0000 (17:43 +0000)]
Change Internal::Control destructor to protected

This is a ref-counted object so another object should not be able to delete it.

Change-Id: I05d2d262f509380586584acfa1fb6646fe1ba688

8 years agoVisuals - Avoid having 2 devel headers for visual-properties.h 79/99579/6
Ferran Sole [Wed, 23 Nov 2016 09:02:32 +0000 (09:02 +0000)]
Visuals - Avoid having 2 devel headers for visual-properties.h

Change-Id: I623d62cba0e16233c187b9df8f0461b8db6fdc0b

8 years agoMerge "Stop copying Property::Maps in ImageView SetProperty" into devel/master
Adeel Kazmi [Thu, 24 Nov 2016 15:04:07 +0000 (07:04 -0800)]
Merge "Stop copying Property::Maps in ImageView SetProperty" into devel/master

8 years agoMerge "Renamed TextVisual::DoSetProperty to SetProperty" into devel/master
Adeel Kazmi [Thu, 24 Nov 2016 14:46:47 +0000 (06:46 -0800)]
Merge "Renamed TextVisual::DoSetProperty to SetProperty" into devel/master

8 years agoRenamed TextVisual::DoSetProperty to SetProperty 04/99904/1
David Steele [Thu, 24 Nov 2016 11:17:30 +0000 (11:17 +0000)]
Renamed TextVisual::DoSetProperty to SetProperty

In accordance with our naming conventions, as DoSetProperty is no longer
overriding a pure virtual, the "Do" prefix has been dropped.

SetProperty remains a private function of TextVisual.

Change-Id: Ib40634048050f90e61c5528d92062d94238dae1c
Signed-off-by: David Steele <david.steele@samsung.com>
8 years ago(Popup) Fix various bugs in Popup 04/99404/10
Adeel Kazmi [Tue, 22 Nov 2016 19:20:34 +0000 (19:20 +0000)]
(Popup) Fix various bugs in Popup

The border was not a property and wasn't being used properly anyway.
The tail calculation was wrong.

Change-Id: Id4438c3edb4316e3f38ad9606758667c9b7de3c6

8 years agoMerge "Modified dali.i and dali-toolkit.i files to add support for the changes made...
Kimmo Hoikka [Wed, 23 Nov 2016 12:49:22 +0000 (04:49 -0800)]
Merge "Modified dali.i and dali-toolkit.i files to add support for the changes made into the native code." into devel/master

8 years agoMerge "Removed Visual::Base::SetProperty and GetProperty" into devel/master
Adeel Kazmi [Wed, 23 Nov 2016 12:38:15 +0000 (04:38 -0800)]
Merge "Removed Visual::Base::SetProperty and GetProperty" into devel/master

8 years agoMerge "Update README for dali-swig" into devel/master
dongsug song [Wed, 23 Nov 2016 12:12:02 +0000 (04:12 -0800)]
Merge "Update README for dali-swig" into devel/master

8 years agoRemoved Visual::Base::SetProperty and GetProperty 28/99028/5
David Steele [Fri, 18 Nov 2016 16:40:18 +0000 (16:40 +0000)]
Removed Visual::Base::SetProperty and GetProperty

Removed the base class methods and all derived methods,
except for text visual, which uses DoSetProperty internally.

Change-Id: I6105f7d1efd0b6b81da09749c86e7334a78e5182
Signed-off-by: David Steele <david.steele@samsung.com>
8 years agoModified dali.i and dali-toolkit.i files to add support for the changes made into... 03/99403/2
Umar [Tue, 22 Nov 2016 18:42:31 +0000 (18:42 +0000)]
Modified dali.i and dali-toolkit.i files to add support for the changes made into the native code.

Change-Id: I59c6e52efea584a48afd1db3b46117c971453d83

8 years agoRevert "DALi C# binding - Write pure C# Color & Position classes and use typemaps... 08/99608/2
Emil Abraham [Wed, 23 Nov 2016 10:59:35 +0000 (02:59 -0800)]
Revert "DALi C# binding - Write pure C# Color & Position classes and use typemaps to do the marshalling between Native Vector[4/3] and C# classes"

This reverts commit 1c79fd0c77d266314b74e32ab8a0070fb5178380.

Change-Id: I5221a5713c1ce87bb13a49073f1dc1d48947a998

8 years agoStop copying Property::Maps in ImageView SetProperty 00/99400/2
Kimmo Hoikka [Tue, 22 Nov 2016 18:01:54 +0000 (18:01 +0000)]
Stop copying Property::Maps in ImageView SetProperty

Change-Id: I120dece3cad2bd5b0de1e7a3c94096cecc968d57

8 years agoSwitch Sync- and AsynchImageLoaders to use new (object less) image loading adaptor API 64/99364/3
Kimmo Hoikka [Tue, 22 Nov 2016 12:58:39 +0000 (12:58 +0000)]
Switch Sync- and AsynchImageLoaders to use new (object less) image loading adaptor API

Change-Id: I6d541f41ab0145f20f849c81a69c8c6369047b76

8 years agoMerge changes Ia2ec4b45,Ied29583a into devel/master
Paul Wisbey [Tue, 22 Nov 2016 16:04:04 +0000 (08:04 -0800)]
Merge changes Ia2ec4b45,Ied29583a into devel/master

* changes:
  Text - First Page Renderer implementation.
  ModelView implementation.

8 years agoText - First Page Renderer implementation. 46/94546/26
Victor Cebollada [Thu, 20 Oct 2016 07:52:38 +0000 (08:52 +0100)]
Text - First Page Renderer implementation.

* Renders a page of static text.
* Doesn't have any style effect.
* Shadows, underline and text auto-scroll don't work.

Change-Id: Ia2ec4b45d2d368448a35083b2f66ec0b6844dd27
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
8 years agoMerge "DALi C# binding - Write pure C# Color & Position classes and use typemaps...
dongsug song [Tue, 22 Nov 2016 04:56:23 +0000 (20:56 -0800)]
Merge "DALi C# binding - Write pure C# Color & Position classes and use typemaps to do the marshalling between Native Vector[4/3] and C# classes" into devel/master

8 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

8 years agoModelView implementation. 49/86349/14
Victor Cebollada [Fri, 26 Aug 2016 13:53:09 +0000 (14:53 +0100)]
ModelView implementation.

* Creates an interface to access the text's model from the text rendering modules.
* In the case the text is elided, it stores a copy of the elided text,
  the ellipsis glyph and the modified layout.
* It creates a basic Text::RenderingController class which stores the
  pointer to the text's model.

Change-Id: Ied29583a0e1648dab9d78575dcbc042353c949dc
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
8 years agoDALi C# binding - Write pure C# Color & Position classes and use typemaps to do the... 36/96336/12
Emil Abraham [Tue, 15 Nov 2016 11:25:13 +0000 (16:55 +0530)]
DALi C# binding - Write pure C# Color & Position classes and use typemaps to do the marshalling between Native Vector[4/3] and C# classes

Change-Id: Ia9ef0af30b8f87166ebcc9af6c89df7feb487346
Signed-off-by: Ravi Nanjundappa <nravi.n@samsung.com>
8 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>
8 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

8 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

8 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

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

8 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

8 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

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

8 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

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

8 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

8 years agoUpdate README for dali-swig 88/98388/1
Yoonsang Lee [Tue, 1 Nov 2016 06:38:18 +0000 (15:38 +0900)]
Update README for dali-swig

Change-Id: I69bff78adad54dc45358f4d5e0774fa0fc73b3bc

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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

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

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

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