platform/core/uifw/dali-toolkit.git
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 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

8 years agoDALi Version 1.1.16 96/56496/1 dali_1.1.16
Lee Morgan [Fri, 8 Jan 2016 14:32:48 +0000 (14:32 +0000)]
DALi Version 1.1.16

Change-Id: I93fe49ce795e2869d19d4bb693d1afadd922ebe7

8 years agoMerge "TextController - Consume the key event." into devel/master
Paul Wisbey [Fri, 8 Jan 2016 09:20:05 +0000 (01:20 -0800)]
Merge "TextController - Consume the key event." into devel/master

8 years agoTextController - Consume the key event. 02/56402/1
Victor Cebollada [Thu, 7 Jan 2016 10:07:37 +0000 (10:07 +0000)]
TextController - Consume the key event.

* Allows multiple text-field in the same application.

Change-Id: I2db59176f71e6a8b9a6efdcccd63d55e3d576ec9
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
8 years agoFix license issues from the protex server 66/56366/2
Seoyeon Kim [Thu, 7 Jan 2016 05:27:53 +0000 (14:27 +0900)]
Fix license issues from the protex server

- Change licence names in .spec to match SPDX identifiers

Change-Id: I34f51c3510b174bcd562690b4ef72e9d09f478a6

8 years agoMerge "Fix svace issue, DEREF_AFTER_NULL case" into devel/master
Adeel Kazmi [Wed, 6 Jan 2016 17:05:32 +0000 (09:05 -0800)]
Merge "Fix svace issue, DEREF_AFTER_NULL case" into devel/master

8 years agoEnable markup processor in text controls. 40/54740/11
Victor Cebollada [Thu, 17 Dec 2015 09:26:09 +0000 (09:26 +0000)]
Enable markup processor in text controls.

Property added to enable and disable the markup processor.

Change-Id: I0c5e237ed235774a5cbcbbb393de7200385575d8
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
8 years agoFix svace issue, DEREF_AFTER_NULL case 63/56063/3
taeyoon [Wed, 30 Dec 2015 08:42:22 +0000 (17:42 +0900)]
Fix svace issue, DEREF_AFTER_NULL case

  Fix DEREF_AFTER_NULL case
  - Access to mEventData without checking NULL

Change-Id: Ib6093ae381e501630e9e78b7e9bb2a4147f5a2bf

8 years agoUpdated README for test cases 38/56338/2
David Steele [Wed, 6 Jan 2016 11:25:04 +0000 (11:25 +0000)]
Updated README for test cases

Change-Id: Idf53707b25aac1dffcd18f8a68f310ce0c7664b8

8 years agoMerge changes I000b9684,I1a6a0f46 into devel/master
Kimmo Hoikka [Tue, 5 Jan 2016 18:33:19 +0000 (10:33 -0800)]
Merge changes I000b9684,I1a6a0f46 into devel/master

* changes:
  (ImageView) Reinstated RESOURCE_URL property for source compatibility with release
  Restored control-depth-index-ranges.h to released version but using devel values internally

8 years ago(ImageView) Reinstated RESOURCE_URL property for source compatibility with release 43/56243/4
Adeel Kazmi [Tue, 5 Jan 2016 15:08:39 +0000 (15:08 +0000)]
(ImageView) Reinstated RESOURCE_URL property for source compatibility with release

- But marked as deprecated

Change-Id: I000b9684d9e94a77d477997a3b5fdfaea7b6cacd

8 years agoRestored control-depth-index-ranges.h to released version but using devel values... 37/56237/7
Adeel Kazmi [Tue, 5 Jan 2016 12:51:31 +0000 (12:51 +0000)]
Restored control-depth-index-ranges.h to released version but using devel values internally

Change-Id: I1a6a0f46c1ac24d126866df2583030e4f34e4b2d

8 years agoTextField - INPUT_COLOR UTC added. 46/56246/1
Victor Cebollada [Tue, 5 Jan 2016 17:15:03 +0000 (17:15 +0000)]
TextField - INPUT_COLOR UTC added.

Change-Id: Ib01859c4b7e77fdb30efb050cf25a8de9c398274
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
8 years agoMerge "(Control) Re-added Background enums" into devel/master
Kimmo Hoikka [Tue, 5 Jan 2016 16:41:13 +0000 (08:41 -0800)]
Merge "(Control) Re-added Background enums" into devel/master

8 years ago(Control) Re-added Background enums 16/56116/4
Adeel Kazmi [Mon, 4 Jan 2016 13:04:10 +0000 (13:04 +0000)]
(Control) Re-added Background enums

- Marked as deprecated

Change-Id: I1c75374a7b76b6235ac4df7166c6ae9641d73a08

8 years agoRemoved automated test case style folder 32/56232/1
David Steele [Tue, 5 Jan 2016 12:50:14 +0000 (12:50 +0000)]
Removed automated test case style folder

Change-Id: I0cc74a0a10238fb9c0497733fc8701f37f5d9f48

8 years ago(TextField) Moved INPUT_COLOR to the end of the enums to ensure binary compatibility... 13/56113/1
Adeel Kazmi [Mon, 4 Jan 2016 11:39:10 +0000 (11:39 +0000)]
(TextField) Moved INPUT_COLOR to the end of the enums to ensure binary compatibility with released version

Change-Id: Id8eb8b12b415c49c343ac3d119d8b09a699a1386

8 years agoAdd dali-addon.manifest 58/55158/4
Yoonsang Lee [Tue, 22 Dec 2015 07:50:39 +0000 (16:50 +0900)]
Add dali-addon.manifest

- Set smack label to '_'
- Without this patch, js native application wouldn't be launched (with jsnative).

Change-Id: I12bd9fbddbd646747368f4ea89899c8e354ba895

8 years agoFixed klocwork errors 31/55431/1
Adeel Kazmi [Wed, 23 Dec 2015 17:51:25 +0000 (17:51 +0000)]
Fixed klocwork errors

Change-Id: I8aba46010774fdecdcdee773bde988a7d1afb4e5

8 years agoDALi Version 1.1.15 25/55425/1 dali_1.1.15
Adeel Kazmi [Wed, 23 Dec 2015 17:21:48 +0000 (17:21 +0000)]
DALi Version 1.1.15

Change-Id: Idd8251914076c566859fec66695ab5e82370a910

8 years agoAdd Control::GetBackgroudColor() implementation 11/54911/4
Xiangyin Ma [Fri, 18 Dec 2015 14:00:03 +0000 (14:00 +0000)]
Add Control::GetBackgroudColor() implementation

Change-Id: If6cce8812d0ff68c7ed263796ca098460c89b905

8 years agoMarkup procesor. Color 98/53798/10
Victor Cebollada [Tue, 15 Dec 2015 11:46:59 +0000 (11:46 +0000)]
Markup procesor. Color

Change-Id: I112a2492c0b6e2f20e864015d9f14ae3ae92d762
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
8 years agoMarkup processor. 89/52689/15
Victor Cebollada [Wed, 25 Nov 2015 14:15:23 +0000 (14:15 +0000)]
Markup processor.

Creates a 'skeleton' of the mark-up processor.

Change-Id: Id98953bda8a22cb9ef2a38c2995c7aa757c95307
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
8 years agoMerge "text-decorator to use ImageView instead of ImageActors" into devel/master
Paul Wisbey [Wed, 16 Dec 2015 10:43:36 +0000 (02:43 -0800)]
Merge "text-decorator to use ImageView instead of ImageActors" into devel/master

8 years agotext-decorator to use ImageView instead of ImageActors 96/54296/2
Agnelo Vaz [Mon, 14 Dec 2015 20:43:35 +0000 (20:43 +0000)]
text-decorator to use ImageView instead of ImageActors

* SolidColorActor occurances replaced with CustomActors with background color set
* ImageActor planned to be deprecated
* Testcase expecting an ImageActor updated

Change-Id: Ieb821143f09637c19a0bcc2b55c0485b6b961596
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
8 years agoMerge "Stop using ImageActor in GaussianBlur, Bloom & SuperBlur" into devel/master
Adeel Kazmi [Tue, 15 Dec 2015 15:31:55 +0000 (07:31 -0800)]
Merge "Stop using ImageActor in GaussianBlur, Bloom & SuperBlur" into devel/master

8 years agoMerge "Change KeyboardFocusManager to always focus when SetCurrentFocus is called...
Adeel Kazmi [Tue, 15 Dec 2015 15:15:09 +0000 (07:15 -0800)]
Merge "Change KeyboardFocusManager to always focus when SetCurrentFocus is called" into devel/master

8 years agoStop using ImageActor in GaussianBlur, Bloom & SuperBlur 24/53424/5
Xiangyin Ma [Fri, 4 Dec 2015 17:26:30 +0000 (17:26 +0000)]
Stop using ImageActor in GaussianBlur, Bloom & SuperBlur

Change-Id: Id5dfa5523914f99a98c222bb02c1f0f90ffaa5da

8 years agoFixed typo of JavaScript API name for layer.lowerBelow 87/54487/1
Richard Huang [Tue, 15 Dec 2015 11:53:26 +0000 (11:53 +0000)]
Fixed typo of JavaScript API name for layer.lowerBelow

Change-Id: Ic42ae2c383f2a9d41afbcf18ce62bc52cc2e515c

8 years agoMerge "Update the custom shader effects to resize the geometry" into devel/master
Adeel Kazmi [Fri, 11 Dec 2015 18:40:26 +0000 (10:40 -0800)]
Merge "Update the custom shader effects to resize the geometry" into devel/master

8 years agoMerge "Text - Add the color to the vertex info." into devel/master
Paul Wisbey [Fri, 11 Dec 2015 17:05:13 +0000 (09:05 -0800)]
Merge "Text - Add the color to the vertex info." into devel/master

8 years agoMerge "Text cleaning." into devel/master
Paul Wisbey [Fri, 11 Dec 2015 17:04:31 +0000 (09:04 -0800)]
Merge "Text cleaning." into devel/master

8 years agoChange KeyboardFocusManager to always focus when SetCurrentFocus is called 07/54007/6
Tom Robinson [Thu, 10 Dec 2015 16:46:23 +0000 (16:46 +0000)]
Change KeyboardFocusManager to always focus when SetCurrentFocus is called

Change-Id: Ic4d0dd51f4e845be420453ebbcecd881fa4398df

8 years agoMerge "DALi Version 1.1.14" into devel/master
Adeel Kazmi [Fri, 11 Dec 2015 15:21:44 +0000 (07:21 -0800)]
Merge "DALi Version 1.1.14" into devel/master

8 years agoMerge "Fix KeyboardFocus indicator alignment" into devel/master
Adeel Kazmi [Fri, 11 Dec 2015 15:06:24 +0000 (07:06 -0800)]
Merge "Fix KeyboardFocus indicator alignment" into devel/master

8 years agoDALi Version 1.1.14 34/54134/1 dali_1.1.14
David Steele [Fri, 11 Dec 2015 14:42:00 +0000 (14:42 +0000)]
DALi Version 1.1.14

Change-Id: I002b4b509cc8e835927a46b6618f5e518f87493e

8 years agoUpdate the custom shader effects to resize the geometry 43/53843/3
Xiangyin Ma [Wed, 9 Dec 2015 17:49:13 +0000 (17:49 +0000)]
Update the custom shader effects to resize the geometry

Change-Id: Ice71ffe5b084286625772743201cc72810c9591e

8 years agoText - Add the color to the vertex info. 90/52690/9
Victor Cebollada [Fri, 20 Nov 2015 10:29:03 +0000 (10:29 +0000)]
Text - Add the color to the vertex info.

Change-Id: I96a16ce938ec0a160f9ba3b98a3e7f4a4af16850
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
8 years agoText cleaning. 41/53841/3
Victor Cebollada [Wed, 9 Dec 2015 15:49:22 +0000 (15:49 +0000)]
Text cleaning.

* Iterators added in the text atlas renderer.
* Removes unimplemented method from the visual model.
* Typo fixed in the text controller.
* Extra white spaces removed.
* std::vector replaced by Dali::Vector in the text controller.
* Some var's type fixes in the text controller.

Change-Id: I75193fc02ea6f1f53ede8a09606167ef4506142f
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
8 years agoChanged JavaScript API name for signal connection and disconnection 08/54008/1
Richard Huang [Thu, 10 Dec 2015 17:05:52 +0000 (17:05 +0000)]
Changed JavaScript API name for signal connection and disconnection

Originally the code for signal connection and disconnection is:

  actor.connect("touched", onTouched);
  actor.disconnect("touched", onTouched);

It needs to be changed to match the style of Node.JS event handling API
and Tizen Native JavaScript API:

  actor.on("touched", onTouched);
  actor.off("touched", onTouched);

Change-Id: I7d90651e6014b795292d696c90cb0ab77531a165

8 years agoFix KeyboardFocus indicator alignment 06/54006/2
Tom Robinson [Thu, 10 Dec 2015 16:40:28 +0000 (16:40 +0000)]
Fix KeyboardFocus indicator alignment

This issue caused the KeyboardFocus indicator to appear offset for some nested layouts. This is due to the wrong position inheritance mode being used.

Change-Id: I204c6d4b9074077a12e68eb2961d0c3ceebbdbd4

8 years agoSupport for building Node Addon for target 73/43973/25
Nick Holland [Wed, 9 Dec 2015 17:42:55 +0000 (17:42 +0000)]
Support for building Node Addon for target

Includes changes to examples to have correct dali node addon path for running on device.

On device to use dali

var dali = require('dali')(options);

Change-Id: I42e77e63d805bb0dbd3700a4c3969b2b9e2d2cc4

8 years agoAdd exception for wrong signal name in JavaScript 16/53516/2
Richard Huang [Mon, 7 Dec 2015 11:25:08 +0000 (11:25 +0000)]
Add exception for wrong signal name in JavaScript

Change-Id: Ie028b9168565492332f1b85306be587240f1b048

8 years agoDALi Version 1.1.13 88/53388/1 dali_1.1.13
Xiangyin Ma [Fri, 4 Dec 2015 11:03:02 +0000 (11:03 +0000)]
DALi Version 1.1.13

Change-Id: If64296973c91bb2d62e32b9fcb9ac7c40e2a70d7

8 years agoFix the segmentation fault error cause by ImageAtlas when application quiting 91/53091/1
Xiangyin Ma [Tue, 1 Dec 2015 18:36:07 +0000 (18:36 +0000)]
Fix the segmentation fault error cause by ImageAtlas when application quiting

Change-Id: Idcb694b29b39c055060c26190d47a5a9eddb17c5

8 years agoremove the duplicate properties from ColorRenderer and BorderRenderer 99/52999/2
Xiangyin Ma [Mon, 30 Nov 2015 17:47:38 +0000 (17:47 +0000)]
remove the duplicate properties from ColorRenderer and BorderRenderer

Change-Id: I7689ae4e97882061b09f643481115f6d1d6b6f29

8 years agoSupport of creating BufferImage from pixel buffer in JavaScript 39/52939/3
Richard Huang [Fri, 27 Nov 2015 15:33:26 +0000 (15:33 +0000)]
Support of creating BufferImage from pixel buffer in JavaScript

Change-Id: Ifebd75c46e45ae56aedd75708279c54c35b33fdb

8 years agoDALi Version 1.1.12 86/52886/1 dali_1.1.12
Adeel Kazmi [Fri, 27 Nov 2015 10:17:17 +0000 (10:17 +0000)]
DALi Version 1.1.12

Change-Id: If5ed4c84f43c60deaf48a8a43cf514bf86dca376

8 years agoFix initial value for matrix property registration 53/52853/1
Nick Holland [Thu, 26 Nov 2015 15:36:12 +0000 (15:36 +0000)]
Fix initial value for matrix property registration

Currently the full contents of imat is not set to the
viewMatrix property.

var imat = [1,0,0,0,
   0,1,0,0,
           0,0,1,0,
           0,0,0,1];
shader.registerAnimatableProperty('viewMatrix', imat);

Change-Id: I25c76b0dc34e5238316b1bc571d8c8cc4ce8cedc

8 years ago(Image Atlas) Fix helgrind simultaneous access issue 46/52646/1
Adeel Kazmi [Wed, 25 Nov 2015 09:46:10 +0000 (09:46 +0000)]
(Image Atlas) Fix helgrind simultaneous access issue

Change-Id: I948c61ab962bd1469cafae82c7ee5c8709c722f0

8 years ago(AutomatedTests) Ensure warnings are shown as errors 28/52428/7
Adeel Kazmi [Mon, 23 Nov 2015 10:06:46 +0000 (10:06 +0000)]
(AutomatedTests) Ensure warnings are shown as errors

Change-Id: Ib85ad8c51010017f8911d9295df0d2f8240ef81f

8 years agoMerge "Remove JavaScript binding for NativeImage, NinePatchImage, ImageActor and...
Adeel Kazmi [Fri, 20 Nov 2015 15:58:50 +0000 (07:58 -0800)]
Merge "Remove JavaScript binding for NativeImage, NinePatchImage, ImageActor and ShaderEffect" into devel/master

8 years agoMerge "Check glyphs are laid out in text-view." into devel/master
Paul Wisbey [Fri, 20 Nov 2015 13:59:40 +0000 (05:59 -0800)]
Merge "Check glyphs are laid out in text-view." into devel/master

8 years agoDALi Version 1.1.11 80/52280/1 dali_1.1.11
Richard Huang [Fri, 20 Nov 2015 10:58:18 +0000 (10:58 +0000)]
DALi Version 1.1.11

Change-Id: I93cf02d11e6a55b17fb59c50838c5d06be00b60e

8 years agoCheck glyphs are laid out in text-view. 48/52148/3
Victor Cebollada [Thu, 19 Nov 2015 09:14:23 +0000 (09:14 +0000)]
Check glyphs are laid out in text-view.

* Check there are glyphs laid out before performing operations

Change-Id: I508959209b405522501b47832e158042bf09d52c
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
8 years agoRemove JavaScript binding for NativeImage, NinePatchImage, ImageActor and ShaderEffect 74/51974/14
Richard Huang [Tue, 17 Nov 2015 17:36:10 +0000 (17:36 +0000)]
Remove JavaScript binding for NativeImage, NinePatchImage, ImageActor and ShaderEffect

Change-Id: Ic68322b4114459c11c4147c224ebf2eaafc055a4

8 years agoMerge "Programming guide of DebugRenderer" into devel/master
Adeel Kazmi [Thu, 19 Nov 2015 15:02:30 +0000 (07:02 -0800)]
Merge "Programming guide of DebugRenderer" into devel/master

8 years agoFix the Slider and Scrollbar issue with nine patch image 60/52060/3
Xiangyin Ma [Wed, 18 Nov 2015 14:45:45 +0000 (14:45 +0000)]
Fix the Slider and Scrollbar issue with nine patch image

Change-Id: Ieb9843466d112205bf360649502e23f38ab8313f

8 years agoProgramming guide of DebugRenderer 68/52168/2
Xiangyin Ma [Thu, 19 Nov 2015 11:50:30 +0000 (11:50 +0000)]
Programming guide of DebugRenderer

Change-Id: I2208e8a63321667c52943ab7826afef85c3d9c41