platform/core/uifw/dali-toolkit.git
8 years agoMerge branch 'devel/master' (1.1.28) into tizen 52/64852/1 accepted/tizen/common/20160411.125807 accepted/tizen/ivi/20160411.051259 accepted/tizen/mobile/20160411.051235 accepted/tizen/tv/20160411.051209 accepted/tizen/wearable/20160411.051133 submit/tizen/20160411.012820
suhyung Eom [Tue, 5 Apr 2016 23:23:55 +0000 (08:23 +0900)]
Merge branch 'devel/master' (1.1.28) into tizen

Change-Id: I42a2f279c73ed0b6045314d2b44038d622915dc0

8 years agoDALi Version 1.1.28 47/64447/1 dali_1.1.28
Victor Cebollada [Fri, 1 Apr 2016 08:22:41 +0000 (09:22 +0100)]
DALi Version 1.1.28

Change-Id: I43c454b45e5e05da1945603f77f65b1cd12bbbdf
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
8 years agoMerge "Fix for text cursor." into devel/master
Paul Wisbey [Thu, 31 Mar 2016 13:58:36 +0000 (06:58 -0700)]
Merge "Fix for text cursor." into devel/master

8 years agoFix for text cursor. 18/64318/1
Victor Cebollada [Thu, 31 Mar 2016 10:25:10 +0000 (11:25 +0100)]
Fix for text cursor.

* Sets the text's layout size to zero when there is no text and no place holder text.

Change-Id: I7d73375fd4aa437a9e30ad7dd0d927f346fe5d21
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
8 years agoAdded "mapping" section parser to Builder. 17/63417/3
David Steele [Fri, 26 Feb 2016 18:41:00 +0000 (18:41 +0000)]
Added "mapping" section parser to Builder.

This can be used by any part of the builder to share objects: the
"mappings" section contains key:value pairs. Any value in the parsed
file that contains "<" + key + ">" is replaced by the corresponding
value from the "mappings" section.

Note also that values in the mapping section can also reference other
keys in the mapping section - there is cycle checking, and this will
leave a value empty on the second reference of a cycle.

test-button and test-animation-data test out some concepts that may
make their way into mainline codebase in the near future, such as a
parser to translate property maps into animation data.

Change-Id: I3bf0392c79861fc3433cefc0ad2a3fc610ff58da

8 years agoMerge "Stop Overriding Actor::Add() & Actor::Remove()" into devel/master
Adeel Kazmi [Wed, 30 Mar 2016 17:31:26 +0000 (10:31 -0700)]
Merge "Stop Overriding Actor::Add() & Actor::Remove()" into devel/master

8 years agoTextModel - Layout a given range of characters inside a text. 13/62713/6
Victor Cebollada [Wed, 9 Mar 2016 15:40:46 +0000 (15:40 +0000)]
TextModel - Layout a given range of characters inside a text.

Change-Id: Ie854d18af10553f2a4381ab6e60fc91f68c21ef0
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
8 years agoStop Overriding Actor::Add() & Actor::Remove() 52/64052/2
Xiangyin Ma [Wed, 23 Mar 2016 16:28:58 +0000 (16:28 +0000)]
Stop Overriding Actor::Add() & Actor::Remove()

Change-Id: I81213f1888d0469eb5b02bc5e9686d70ba79f113

8 years agoMerge "DALi Version 1.1.27" into devel/master
Adeel Kazmi [Thu, 24 Mar 2016 16:35:30 +0000 (09:35 -0700)]
Merge "DALi Version 1.1.27" into devel/master

8 years agoDALi Version 1.1.27 85/63585/1 dali_1.1.27
Tom Robinson [Thu, 24 Mar 2016 15:49:09 +0000 (15:49 +0000)]
DALi Version 1.1.27

Change-Id: Iea5cd11685c90dc45c29d4f6096305e3e8c18242

8 years agoMerge "Fix for text renderer. Set the right size in order to cull the actor correctly...
Paul Wisbey [Thu, 24 Mar 2016 13:39:58 +0000 (06:39 -0700)]
Merge "Fix for text renderer. Set the right size in order to cull the actor correctly." into devel/master

8 years agoProgramming guide of SVG Renderer 23/63223/4
Xiangyin Ma [Tue, 22 Mar 2016 18:47:13 +0000 (18:47 +0000)]
Programming guide of SVG Renderer

Change-Id: I1ce2607ebd5ba4fcc7ff40fbe3795620f3c034e1

8 years agoFix for text renderer. Set the right size in order to cull the actor correctly. 67/63367/1
Victor Cebollada [Wed, 23 Mar 2016 08:08:06 +0000 (08:08 +0000)]
Fix for text renderer. Set the right size in order to cull the actor correctly.

Change-Id: Iad29ca658c92f1bee620e39b3164f4fc2fff6d54
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
8 years agoSVG support for ImageView ( CPU rendering version ) 48/60148/16
Xiangyin Ma [Mon, 22 Feb 2016 15:52:12 +0000 (15:52 +0000)]
SVG support for ImageView ( CPU rendering version )

Change-Id: I220bb575d2f66deca04106b091dd15aaed34302f

8 years agoPropertyBuffer SetData clean-up 24/63024/3
Paul Wisbey [Mon, 21 Mar 2016 17:06:40 +0000 (17:06 +0000)]
PropertyBuffer SetData clean-up

Change-Id: Ie99400f090ee5516f8fcb90e8fea307fe41bbf48

8 years agoMerge branch 'devel/master' into tizen 12/62912/1 accepted/tizen/common/20160323.184847 accepted/tizen/ivi/20160323.140635 accepted/tizen/mobile/20160323.135022 accepted/tizen/mobile/20160323.223933 accepted/tizen/tv/20160323.135440 accepted/tizen/tv/20160323.223917 accepted/tizen/wearable/20160323.135138 accepted/tizen/wearable/20160323.223948 submit/tizen/20160323.065919 submit/tizen_mobile/20160323.222707 submit/tizen_tv/20160323.222827 submit/tizen_wearable/20160323.222755
minho.sun [Mon, 21 Mar 2016 02:50:22 +0000 (11:50 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: Ia1ba67611e0706f9d95d79c4f042234b6a18f200

8 years agoDALi Version 1.1.26 23/62823/1 dali_1.1.26
Richard Huang [Fri, 18 Mar 2016 13:10:01 +0000 (13:10 +0000)]
DALi Version 1.1.26

Change-Id: I420d404c5ea446ade9ebb0085a3bf46dc525c1fc

8 years agoFixed crash for stage touched signal callback in JavaScript 66/62366/1
Richard Huang [Tue, 15 Mar 2016 17:57:13 +0000 (17:57 +0000)]
Fixed crash for stage touched signal callback in JavaScript

Change-Id: I11858186c448ba9d2a21f597351fe5275667d514

8 years agoMerge "Added Emscripten guide" into devel/master
Paul Wisbey [Mon, 14 Mar 2016 13:11:26 +0000 (06:11 -0700)]
Merge "Added Emscripten guide" into devel/master

8 years agoDALi Version 1.1.25 75/61975/1 dali_1.1.25
Nick Holland [Fri, 11 Mar 2016 15:02:35 +0000 (15:02 +0000)]
DALi Version 1.1.25

Change-Id: I8b92be804f4af7e50413b26add1db324c6048fd4

8 years agoFixing test cases after Texture::Bind cleanup. 85/60885/2
David Steele [Wed, 2 Mar 2016 20:16:48 +0000 (20:16 +0000)]
Fixing test cases after Texture::Bind cleanup.

Some test cases were expecting a texture to be rendered, but weren't providing
pixel data. With the cleanup to Texture::Bind preventing a call to glBindTexture
without pixel data, this is no longer the case.

Added dummy pixel data to ensure the test cases pass.

Change-Id: I67268b3a4a9446ff5745bc43f7f9f67f13c5ff69
Signed-off-by: David Steele <david.steele@samsung.com>
8 years agoAdded Emscripten guide 62/61062/5
Tom Robinson [Thu, 3 Mar 2016 15:53:44 +0000 (15:53 +0000)]
Added Emscripten guide

Describes:
* What Emscripten is
* What we can do with it in DALi
* How to build it
* How to run the examples
* How to run the tests
* Debugging & Tips

Change-Id: I10df79315f1d62e1add4ad7d9c367a472f3d3bdf

8 years agoTextModel - Shape the given number of characters inside a text. 66/61066/4
Victor Cebollada [Thu, 3 Mar 2016 09:14:34 +0000 (09:14 +0000)]
TextModel - Shape the given number of characters inside a text.

Change-Id: I8936449b132cfaf28941af58f19e06536297815e
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
8 years agoDALi Version 1.1.24 21/61321/1 dali_1.1.24
Ferran Sole [Mon, 7 Mar 2016 09:07:46 +0000 (09:07 +0000)]
DALi Version 1.1.24

Change-Id: I2e067240be9283416dec5ab90a8ca9115735c820

8 years agoTextModel - Create the bidirectional info for a given range of characters inside... 56/60856/5
Victor Cebollada [Thu, 18 Feb 2016 09:45:31 +0000 (09:45 +0000)]
TextModel - Create the bidirectional info for a given range of characters inside a text.

Change-Id: I00d0c68d9d354d30e6fe3ad67de8d99f7c0651d4
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
8 years agoTextModel - Create the text language info for a given range of characters inside... 75/60675/5
Victor Cebollada [Fri, 12 Feb 2016 09:11:31 +0000 (09:11 +0000)]
TextModel - Create the text language info for a given range of characters inside a text.

Change-Id: I48fdb5f7fda20f2f3c45566160b5e7d739f8afb9
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
8 years agoTextModel - Create the text segmentation info for a given range of characters inside... 04/59304/4
Victor Cebollada [Fri, 12 Feb 2016 08:45:08 +0000 (08:45 +0000)]
TextModel - Create the text segmentation info for a given range of characters inside a text.

Change-Id: Ia00c9fa34aab4a7c8aedd1168dcc41740f30311a
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
8 years agoChanges following deprecation of position inheritance modes 05/59805/8
Ferran Sole [Thu, 18 Feb 2016 17:24:23 +0000 (17:24 +0000)]
Changes following deprecation of position inheritance modes

Change-Id: I2f47ceaa3766a56e4af7cb0627815642b0754a51

8 years agoChanged license on Tizen theme files to Apache. 59/60659/1
David Steele [Mon, 29 Feb 2016 16:12:17 +0000 (16:12 +0000)]
Changed license on Tizen theme files to Apache.

Change-Id: I56ae11e68e05a02219d5185ffda85f645b3e7d6b
Signed-off-by: David Steele <david.steele@samsung.com>
8 years agoDALi Version 1.1.23 95/60495/1 dali_1.1.23
David Steele [Fri, 26 Feb 2016 13:45:27 +0000 (13:45 +0000)]
DALi Version 1.1.23

Change-Id: I571ff7edd0ff2b24e804cab0db66b7167469dd97

8 years agoMerge branch 'devel/master' into tizen 39/60139/2 accepted/tizen/common/20160302.194024 accepted/tizen/ivi/20160302.073519 accepted/tizen/mobile/20160302.073314 accepted/tizen/tv/20160302.073350 accepted/tizen/wearable/20160302.073454 submit/tizen/20160226.050754 submit/tizen/20160226.083322 submit/tizen/20160302.020723 submit/tizen_common/20160302.050715 submit/tizen_ivi/20160302.061840 submit/tizen_mobile/20160302.050207 submit/tizen_mobile/20160302.061559 submit/tizen_tv/20160302.063027 submit/tizen_wearable/20160302.063323
dongsug.song [Tue, 23 Feb 2016 13:27:04 +0000 (22:27 +0900)]
Merge branch 'devel/master' into tizen

tizen branch 1.1.16 => 1.1.22 version updated

Change-Id: I80cf55c7dff31c7d22b8a006cb8c9b70b4d7e4b2

8 years agoMerge "(Programming Guide) Initial chapter on creating a custom control" into devel...
Kimmo Hoikka [Thu, 25 Feb 2016 17:40:54 +0000 (09:40 -0800)]
Merge "(Programming Guide) Initial chapter on creating a custom control" into devel/master

8 years agoMerge "Add Layer documentation" into devel/master
Kimmo Hoikka [Thu, 25 Feb 2016 17:37:44 +0000 (09:37 -0800)]
Merge "Add Layer documentation" into devel/master

8 years agoFix animations in JavaScript mesh API examples 67/60367/1
Richard Huang [Thu, 25 Feb 2016 16:18:12 +0000 (16:18 +0000)]
Fix animations in JavaScript mesh API examples

Change-Id: I0a26ec4f05fbac468debd40c9517c4fbd1879b69

8 years ago(Programming Guide) Initial chapter on creating a custom control 48/59948/8
Adeel Kazmi [Fri, 19 Feb 2016 15:53:35 +0000 (15:53 +0000)]
(Programming Guide) Initial chapter on creating a custom control

- Update Properties to include Animatable Properties
  - Also updated the examples
- Updated Accessibility
- Added a CMakeLists.txt to the example-code directly to directly build the example code

Change-Id: I8a363e79a13d639b14be6d1d4ae487eea9d35563

8 years agoAdd Layer documentation 00/58000/9
Nick Holland [Wed, 3 Feb 2016 15:28:04 +0000 (15:28 +0000)]
Add Layer documentation

Change-Id: I9ab1a03bd62aa50382aad4b3d11ca23becf0dac8

8 years agoRevert "[3.0] NativeImageSource with tbm_surface for tizen 3.0 wayland" 38/60138/1
dongsug.song [Tue, 23 Feb 2016 13:23:59 +0000 (22:23 +0900)]
Revert "[3.0] NativeImageSource with tbm_surface for tizen 3.0 wayland"

This reverts commit 23a0a8a037d1d2627ab60eaf2d755789b82f1aeb.

Change-Id: Ieeb59acaa544c01222258e22b4687bd5ae742027

8 years agoRevert "[3.0] Ensure the use of ShaderEffect in ImageActor is backwards-compatible" 37/60137/1
dongsug.song [Tue, 23 Feb 2016 13:21:10 +0000 (22:21 +0900)]
Revert "[3.0] Ensure the use of ShaderEffect in ImageActor is backwards-compatible"

This reverts commit c790748839e08ca8d2069f866373d9d8bfaf68fa.

Change-Id: Idbc2043a5d9e530163d78eee0c77a6fcced919e6

8 years agoMerge "DALi Version 1.1.22" into devel/master
Adeel Kazmi [Fri, 19 Feb 2016 11:16:42 +0000 (03:16 -0800)]
Merge "DALi Version 1.1.22" into devel/master

8 years agoDALi Version 1.1.22 18/59918/1 dali_1.1.22
Agnelo Vaz [Fri, 19 Feb 2016 10:52:26 +0000 (10:52 +0000)]
DALi Version 1.1.22

Change-Id: I9d3e2add7cf059f5aef0cccb5bdad516c7c2863c

8 years ago(Control Renderers) Removed Renderer suffix from rendererType & created programming... 13/59713/5
Adeel Kazmi [Wed, 17 Feb 2016 19:30:14 +0000 (19:30 +0000)]
(Control Renderers) Removed Renderer suffix from rendererType & created programming guide

Change-Id: Ifd764c90a387a3be2dc8085650de8dfead5421b2

8 years ago[3.0] Ensure the use of ShaderEffect in ImageActor is backwards-compatible 43/59743/2 accepted/tizen/ivi/20160219.012703 accepted/tizen/mobile/20160218.111027 accepted/tizen/tv/20160218.111050 accepted/tizen/wearable/20160218.111113 submit/tizen/20160218.103925 submit/tizen_common/20160218.142243
Xiangyin Ma [Thu, 11 Feb 2016 16:47:47 +0000 (16:47 +0000)]
[3.0] Ensure the use of ShaderEffect in ImageActor is backwards-compatible

Change-Id: I2994b917eb8f63edbec95838be899073887b2eeb

8 years agoSet DPI when testing font-client 90/59690/3
Paul Wisbey [Wed, 17 Feb 2016 11:02:16 +0000 (11:02 +0000)]
Set DPI when testing font-client

Change-Id: Ifd4fcf18225ea175195e91593b1395c24c7e4c7b

8 years agoEnsure the use of ShaderEffect in ImageActor is backwards-compatible 43/59243/2
Xiangyin Ma [Thu, 11 Feb 2016 16:47:47 +0000 (16:47 +0000)]
Ensure the use of ShaderEffect in ImageActor is backwards-compatible

Change-Id: I2994b917eb8f63edbec95838be899073887b2eeb

8 years agoUpdate public header comments of DALi toolkit 82/58782/5
Seoyeon Kim [Wed, 3 Feb 2016 10:19:20 +0000 (19:19 +0900)]
Update public header comments of DALi toolkit

Change-Id: If6028b673ef00ea8ad115975fa7db88c18d579c1

8 years agoDALi Version 1.1.21 11/59311/1 dali_1.1.21
Adeel Kazmi [Fri, 12 Feb 2016 10:32:22 +0000 (10:32 +0000)]
DALi Version 1.1.21

Change-Id: I581a09c94c0b57077e94423e74ce9c635c201e16

8 years agoUpgraded test harness 16/59016/4
David Steele [Mon, 8 Feb 2016 11:50:10 +0000 (11:50 +0000)]
Upgraded test harness

A new Serial mode has been added to the test harness that will run
test cases in serial without using Testkit Lite. This executes all
the dali test cases in ~35 seconds, and dumps the test case output
to stdout/stderr. It can be run using "execute.sh -S"

Have changed the Parallel mode to always re-run failing test cases,
causing it to display the failing checks.

All types of execution now write to summary.xml, and display a human
readable version of it before exiting.

execute.sh's exit status has been changed - 0 means no failures,
1 means there was a test case failure.

Ensured TestGLAbstraction initialization covers all member variables.

Changed Update/Render to check if it's required and to log a warning
if not. Test cases should avoid calling application.Update() or
application.Render() when not required.

Change-Id: I391cf76211ee22472c6b87e9f7ac255d3e147dd7
Signed-off-by: David Steele <david.steele@samsung.com>
8 years agoUpdate following the changes of blending&culling options 24/58524/5
Xiangyin Ma [Fri, 29 Jan 2016 16:31:30 +0000 (16:31 +0000)]
Update following the changes of blending&culling options

Change-Id: I2a48b7d440b31f93ac2d8478f0ffe10ca417099d

8 years agoDALi Version 1.1.20 47/58947/1 dali_1.1.20
Xiangyin Ma [Fri, 5 Feb 2016 08:53:13 +0000 (08:53 +0000)]
DALi Version 1.1.20

Change-Id: I64d80ae43dc3fe82e388f733d4e432953bd2dcde

8 years agoFix for bidirectional support. 72/58772/2
Victor Cebollada [Wed, 3 Feb 2016 09:15:09 +0000 (09:15 +0000)]
Fix for bidirectional support.

-Use the character's direction to know whether to mirror it.

This patches fix a 'mirroring' issue when there is bidirectional text.
i.e if RTL text is added to the string "(Hello world)", the text controller
replaces (mirror) the parenthesis getting the string ")Hello world( RTL_text"

It needs https://review.tizen.org/gerrit/#/c/58668/

Change-Id: If4210aa15d516a4688cd1c79aef7fb714e5f8f69
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
8 years agoMerge "NativeImageSource with tbm_surface for tizen 3.0 wayland" into devel/master
taeyoon [Tue, 2 Feb 2016 01:30:30 +0000 (17:30 -0800)]
Merge "NativeImageSource with tbm_surface for tizen 3.0 wayland" into devel/master

8 years agoNativeImageSource with tbm_surface for tizen 3.0 wayland 17/52517/16
taeyoon [Tue, 24 Nov 2015 06:00:36 +0000 (15:00 +0900)]
NativeImageSource with tbm_surface for tizen 3.0 wayland

 - NativeImageSource uses XPixmap or Ecore Pixmap type in x windows system.
 - Tizen 3.0 wayland doesn't support the pixmap type.
 -> Replaces pixmap to tbm_surface.
 -> Adds handling fragment shader code into ImageRenderer for tbm_surface
 -> Adds UTCs for various scenarios of ImageView (NativeImage vs. Regular image)

Change-Id: Ibe3747dcf5711f11770ae1e54d1ca37577d7ca6f

8 years ago[3.0] NativeImageSource with tbm_surface for tizen 3.0 wayland 19/58419/2 accepted/tizen/ivi/20160218.024412 accepted/tizen/mobile/20160201.043152 accepted/tizen/tv/20160201.043215 accepted/tizen/wearable/20160201.043237 submit/tizen/20160201.030218 submit/tizen_ivi/20160217.000000 submit/tizen_ivi/20160217.000004
taeyoon [Tue, 24 Nov 2015 06:00:36 +0000 (15:00 +0900)]
[3.0] NativeImageSource with tbm_surface for tizen 3.0 wayland

Change-Id: Ibe3747dcf5711f11770ae1e54d1ca37577d7ca6f

8 years agoDALi Version 1.1.19 44/58344/1 dali_1.1.19
Tom Robinson [Fri, 29 Jan 2016 11:33:33 +0000 (11:33 +0000)]
DALi Version 1.1.19

Change-Id: I2ce108d82a29982255cb4e665b210113b5a6566f

8 years agoFixed Builder not allowing nested maps for properties 91/57291/7
Tom Robinson [Mon, 18 Jan 2016 15:50:28 +0000 (15:50 +0000)]
Fixed Builder not allowing nested maps for properties

Change-Id: I3652ae654cc549ed948f0d54da557bfac90bf78f

8 years agoRemove control-depth-index-ranges.h as it was never actually installed, install devel... 92/58092/1
Adeel Kazmi [Wed, 27 Jan 2016 11:16:53 +0000 (11:16 +0000)]
Remove control-depth-index-ranges.h as it was never actually installed, install devel-api version instead

The public-api file was not actually ever installed and was erroneously put in the public-api folder.
This change also ensures that the devel-api version is installed (we can still change this as it is not public-api)

Change-Id: Iff2cabf197e1454e18e9e6e876650d2859f0dec7

8 years agoApply the new doxygen tagging rule for @DEPRECATED 13/57713/5
Yoonsang Lee [Fri, 22 Jan 2016 04:43:19 +0000 (13:43 +0900)]
Apply the new doxygen tagging rule for @DEPRECATED

- Change @deprecrated 1.x.x to @DEPRECATED_1_x.x to follow the new doxygen tagging rule.

Change-Id: I2054064fda1d0737560d187a9d2cf8e7c865ab9a

8 years agoMerge "Apply the new doxygen tagging rule for @SINCE" into devel/master
Adeel Kazmi [Tue, 26 Jan 2016 15:42:22 +0000 (07:42 -0800)]
Merge "Apply the new doxygen tagging rule for @SINCE" into devel/master

8 years agoMerge "Add ALIASES for new DALi doxygen tagging rule to dali.doxy.in" into devel...
Adeel Kazmi [Tue, 26 Jan 2016 15:40:03 +0000 (07:40 -0800)]
Merge "Add ALIASES for new DALi doxygen tagging rule to dali.doxy.in" into devel/master

8 years agoMerge "Updated programming guide for image-scaling-and-fitting" into devel/master
Kimmo Hoikka [Tue, 26 Jan 2016 15:38:18 +0000 (07:38 -0800)]
Merge "Updated programming guide for image-scaling-and-fitting" into devel/master

8 years agoMerge "Fix for text's popup." into devel/master
Paul Wisbey [Tue, 26 Jan 2016 14:33:58 +0000 (06:33 -0800)]
Merge "Fix for text's popup." into devel/master

8 years agoApply the new doxygen tagging rule for @SINCE 46/57546/15
Yoonsang Lee [Fri, 22 Jan 2016 00:28:43 +0000 (09:28 +0900)]
Apply the new doxygen tagging rule for @SINCE

- Change @since 1.1.x to @SINCE_1_1.x to follow the new doxygen tagging rule.
- Add @SINCE_1_0.0 for all symbols not having @since tag.
- Sort the order of doxygen tags as guided by the Tizen guideline.
  ('platform','deprecated','brief','details','since_tizen','privlevel',
   'privilege', 'remarks','param','return','retval','exception','pre','post',
   'note','see')

Change-Id: I99ce2a063f1d28130bc7951de212c47b5af06509

8 years agoAdd ALIASES for new DALi doxygen tagging rule to dali.doxy.in 35/57835/7
Yoonsang Lee [Mon, 25 Jan 2016 06:52:39 +0000 (15:52 +0900)]
Add ALIASES for new DALi doxygen tagging rule to dali.doxy.in

Use @SINCE_1_0, @SINCE_1_1, ... instead of @since,
and use @DEPRECATED_1_0, @DEPRECATED_1_1, ... instead of @deprecated.
It enables integrated management of version tagging between
the open source DALi API reference and Tizen API reference.
Using those tags with different ALIASES settings in each doxygen config file allows us
to generate two versions of "Since" and "Deprecated" generated output
from one set of public header files.

Change-Id: I162f679dda074617aef39d21a51f25c149977f9b

8 years agoMerge "Fix JavaScript docs, where orientation property still called rotation" into...
Adeel Kazmi [Mon, 25 Jan 2016 17:21:19 +0000 (09:21 -0800)]
Merge "Fix JavaScript docs, where orientation property still called rotation" into devel/master

8 years agoFix JavaScript docs, where orientation property still called rotation 82/57782/3
Nick Holland [Fri, 22 Jan 2016 13:37:07 +0000 (13:37 +0000)]
Fix JavaScript docs, where orientation property still called rotation

Change-Id: I9442b946debf8801f49adadd8de54904fc433560

8 years agoFix for text's popup. 80/57880/1
Victor Cebollada [Mon, 25 Jan 2016 14:41:05 +0000 (14:41 +0000)]
Fix for text's popup.

-Do not show the text's popup when none of the buttons are active.

Change-Id: I9e080c446ac185cdd86a46885389a834be73cc89
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
8 years agoMerge "JavaScript binding for ScrollView" into devel/master
Kimmo Hoikka [Fri, 22 Jan 2016 18:16:47 +0000 (10:16 -0800)]
Merge "JavaScript binding for ScrollView" into devel/master

8 years agoDALi Version 1.1.18 76/57776/1 dali_1.1.18
Richard Huang [Fri, 22 Jan 2016 13:28:59 +0000 (13:28 +0000)]
DALi Version 1.1.18

Change-Id: Ib6526ea8b5e67d128830f631003eb9e24083cc85

8 years agoJavaScript binding for ScrollView 74/57674/3
Richard Huang [Thu, 21 Jan 2016 11:56:43 +0000 (11:56 +0000)]
JavaScript binding for ScrollView

This patch includes:

1. ScrollView API binding
2. Documentation for ScrollView JavaScript API
3. JavaScript example for ScrollView
4. Changed the type of built-in animation alpha function from string to enumeration

Change-Id: I6482ffd6a0201a1d71258fbb6a53184a4a07e615

8 years agoMerge "Prevented json array of numbers appending on merge" into devel/master
Adeel Kazmi [Thu, 21 Jan 2016 17:53:59 +0000 (09:53 -0800)]
Merge "Prevented json array of numbers appending on merge" into devel/master

8 years agoPrevented json array of numbers appending on merge 09/56809/8
David Steele [Tue, 12 Jan 2016 17:37:42 +0000 (17:37 +0000)]
Prevented json array of numbers appending on merge

If 2 JSON files are merged into the same JSON parser (by calling Parse(first) then
calling Parse(second) ), then currently, nodes in the tree with the same
key but with differing types are overridden, but object and array
types are merged.

This is problematic for styling, where colors are represented as JSON arrays.

Changed matching arrays of numbers to override rather than merge.

Change-Id: Ia7a37a16919aa8648e7fe34430c5abf04cfaddb4
Signed-off-by: David Steele <david.steele@partner.samsung.com>
8 years agoMerge "Update gbs build makefile for node addon" into devel/master
Adeel Kazmi [Thu, 21 Jan 2016 11:15:39 +0000 (03:15 -0800)]
Merge "Update gbs build makefile for node addon" into devel/master

8 years agoReporting dali version on stderr instead of stdout 07/56807/5
David Steele [Tue, 12 Jan 2016 17:34:41 +0000 (17:34 +0000)]
Reporting dali version on stderr instead of stdout

Can use JSON parser directly from library without requiring a dali
application. If the writer is used to write to stdout, then the output
is 'corrupted' by having the library version numbers within it. It is
better instead to report the version numbers on stderr (Better still
to log them, rather than using stream).

Change-Id: Ie1cb6b1e3cc04a6e4f643ed4d6336f33b2e025f0

8 years agoChanged JSON parser to write valid JSON 04/56804/4
David Steele [Tue, 12 Jan 2016 17:14:48 +0000 (17:14 +0000)]
Changed JSON parser to write valid JSON

After parsing a JSON file, calling Write on the JsonParser now writes
valid JSON as an output; also fixed the indent levels and rolled up
arrays of numbers onto a single line to make it more readable.

Change-Id: I9413f5c3f7f4695b39e4f305eccf84b638c632bb
Signed-off-by: David Steele <david.steele@partner.samsung.com>
8 years agoRe-order StyleManager implementation file to match header 86/56786/2
David Steele [Tue, 12 Jan 2016 14:42:38 +0000 (14:42 +0000)]
Re-order StyleManager implementation file to match header

Change-Id: I4c55d156a1019e13b862617bda30a99bd0a093fb

8 years agoUpdated programming guide for image-scaling-and-fitting 82/57182/6
Tom Robinson [Fri, 15 Jan 2016 16:32:44 +0000 (16:32 +0000)]
Updated programming guide for image-scaling-and-fitting

Change-Id: I9c9b548b832a5b0fe9b2bf1d5296815c02635954

8 years agoFixed typo in ItemView property name and added UTC for new properties in ItemView... 12/57512/2
Richard Huang [Wed, 20 Jan 2016 15:02:19 +0000 (15:02 +0000)]
Fixed typo in ItemView property name and added UTC for new properties in ItemView and ScrollView

Change-Id: Ic24b8e7d317cc999ae17ec3b51eff49d1c1402b6

8 years agoMerge "Pre-multiplied Alpha support for ImageView" into devel/master
Kimmo Hoikka [Wed, 20 Jan 2016 14:59:09 +0000 (06:59 -0800)]
Merge "Pre-multiplied Alpha support for ImageView" into devel/master

8 years agoMerge "PixelArea support for ImageView" into devel/master
Kimmo Hoikka [Wed, 20 Jan 2016 14:59:01 +0000 (06:59 -0800)]
Merge "PixelArea support for ImageView" into devel/master

8 years agoPre-multiplied Alpha support for ImageView 25/56925/14
Xiangyin Ma [Fri, 15 Jan 2016 15:26:25 +0000 (15:26 +0000)]
Pre-multiplied Alpha support for ImageView

Change-Id: Ia2a4c293e96e239a84f5e039304e25a4ba6b4492

8 years agoPixelArea support for ImageView 91/56791/11
Xiangyin Ma [Tue, 12 Jan 2016 15:23:12 +0000 (15:23 +0000)]
PixelArea support for ImageView

Change-Id: Ie9caace6fe18146d120f11665237fc4bec661aec

8 years agoTextDecorator - Fix a crash when decorator actors are not created. 00/57500/1
Victor Cebollada [Wed, 20 Jan 2016 11:50:33 +0000 (11:50 +0000)]
TextDecorator - Fix a crash when decorator actors are not created.

Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Change-Id: If4b9e4d2900a8cffaeec02b2de91449c00caf787

8 years agoUpdate gbs build makefile for node addon 83/57483/1
Richard Huang [Wed, 20 Jan 2016 11:02:34 +0000 (11:02 +0000)]
Update gbs build makefile for node addon

Change-Id: Ifc5463fabc23282e803e08d0b4a94f35311e8cd0

8 years agoMerge "JavaScript binding for ItemView" into devel/master
Kimmo Hoikka [Tue, 19 Jan 2016 18:30:16 +0000 (10:30 -0800)]
Merge "JavaScript binding for ItemView" into devel/master

8 years agoAdded new properties to make ScrollView more scriptable 96/56796/6
Richard Huang [Tue, 12 Jan 2016 15:58:49 +0000 (15:58 +0000)]
Added new properties to make ScrollView more scriptable

Change-Id: I32701acb1f9ab0ce09af1c6c991713389dda4e3e

8 years agoJavaScript binding for ItemView 22/56422/15
Richard Huang [Thu, 7 Jan 2016 16:05:12 +0000 (16:05 +0000)]
JavaScript binding for ItemView

Change-Id: If4ba2434a2ea7a22cacd13d431dbe54bf56540b9

8 years agoSeperate dali-adaptor & dali-adaptor-uv packages 37/55837/7
Yoonsang Lee [Tue, 29 Dec 2015 07:17:29 +0000 (16:17 +0900)]
Seperate dali-adaptor & dali-adaptor-uv packages

- Remove dali-adaptor dependency from dali-toolkit.
- Add dali-adaptor-uv dependency to dali-addon because DALi JS apps always
run the libuv-based adaptor.
- Before this patch, dali-addon only checked dali-adaptor package (which was
confusingly named to 'dali') and dali-toolkit package.
- Now dali-addon checks dali-core, dali-adaptor-uv, and dali-toolkit packages to make it clearer.

Change-Id: Iaca57047a250ee863bbe6963c31168a7bdbacd68

8 years agoMultiline - Create a text-editor control. 93/56893/5
Victor Cebollada [Mon, 11 Jan 2016 09:00:21 +0000 (09:00 +0000)]
Multiline - Create a text-editor control.

Change-Id: If2d26ec599b30fcb121d0ff720f67fc9f6b0263b
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
8 years agoMerge "DALi Version 1.1.17" into devel/master
Adeel Kazmi [Fri, 15 Jan 2016 15:09:07 +0000 (07:09 -0800)]
Merge "DALi Version 1.1.17" into devel/master

8 years agoDALi Version 1.1.17 70/57170/1 dali_1.1.17
Nick Holland [Fri, 15 Jan 2016 14:40:40 +0000 (14:40 +0000)]
DALi Version 1.1.17

Change-Id: I185f85427bc6a236d22c38409db2fbc419328f18

8 years agoFixed regression with Actor::COLOR property in TextLabel 49/57149/1
Paul Wisbey [Fri, 15 Jan 2016 11:16:48 +0000 (11:16 +0000)]
Fixed regression with Actor::COLOR property in TextLabel

Change-Id: I16eb72d23354af029f5e451e60e99219456663af

8 years agoMerge branch 'devel/master( 1.1.16 )' into tizen 77/57077/1 accepted/tizen/mobile/20160122.080625 accepted/tizen/tv/20160122.082337 accepted/tizen/wearable/20160122.082359 submit/tizen_common/20160122.071605 submit/tizen_mobile/20160122.070055 submit/tizen_tv/20160122.071800 submit/tizen_wearable/20160122.071938
taeyoon [Fri, 15 Jan 2016 04:39:17 +0000 (13:39 +0900)]
Merge branch 'devel/master( 1.1.16 )' into tizen

Change-Id: I8b19edc8c542513949240c6a3a3259fdd3632805

8 years agoRevert "[3.0] Fix for text-view." 68/55868/2
taeyoon [Wed, 30 Dec 2015 02:37:29 +0000 (11:37 +0900)]
Revert "[3.0] Fix for text-view."

This reverts commit 0b6e2ed488d1e0a8e3429f46cfab18e59064d589.

Change-Id: If8e5739bc66402678c039507000d8f7d7de7d51b

8 years agoRevert "[3.0] Fix svace issues" 67/55867/2
taeyoon [Wed, 30 Dec 2015 02:36:54 +0000 (11:36 +0900)]
Revert "[3.0] Fix svace issues"

This reverts commit 2eea2efda506ac048e2fe8ddf684088e413d187c.

Change-Id: I958350b8662ee1dd0cb2cc3f9b0f7d7181be02de

8 years agoRevert "[3.0] Fix license issues from the protex server" 75/57075/1
taeyoon [Fri, 15 Jan 2016 04:36:26 +0000 (13:36 +0900)]
Revert "[3.0] Fix license issues from the protex server"

This reverts commit 1788345e3f5b53bde5f5a2fa2e6289719dc6c544.

Change-Id: Id4438fb2fc39a8aa225c1d7185d932bbd5434066

8 years agoConvert CR or CR+LF to LF. 70/46070/3
Victor Cebollada [Thu, 16 Jul 2015 12:54:46 +0000 (13:54 +0100)]
Convert CR or CR+LF to LF.

Change-Id: Icd14045ddd7f74f690fcacbffe8ad33ba1f5fbd2
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
8 years agoAnti-Aliasing of BorderRenderer 04/56504/5
Xiangyin Ma [Fri, 8 Jan 2016 15:16:52 +0000 (15:16 +0000)]
Anti-Aliasing of BorderRenderer

Change-Id: I81fd631ec6e0ff394082081065c23d3673366a2c

8 years agoMerge "Markup procesor - Font." into devel/master
Paul Wisbey [Mon, 11 Jan 2016 11:58:34 +0000 (03:58 -0800)]
Merge "Markup procesor - Font." into devel/master

8 years agoMarkup procesor - Font. 00/53800/12
Victor Cebollada [Wed, 25 Nov 2015 15:17:13 +0000 (15:17 +0000)]
Markup procesor - Font.

Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Change-Id: Icd3e97862b96f2631a17595136359a08fdfd2371

8 years agoMerge "DALi Version 1.1.16" into devel/master
Adeel Kazmi [Fri, 8 Jan 2016 14:53:53 +0000 (06:53 -0800)]
Merge "DALi Version 1.1.16" into devel/master