Paul Wisbey [Mon, 30 Nov 2015 13:48:04 +0000 (13:48 +0000)]
Vector-based text rendering
Change-Id: Ieadbb0e545219f8184fe50bb6f00bfaced902184
Kimmo Hoikka [Tue, 19 Apr 2016 16:01:21 +0000 (09:01 -0700)]
Merge "Flexbox UI control implementation" into devel/master
Adeel Kazmi [Tue, 19 Apr 2016 11:32:11 +0000 (12:32 +0100)]
Removed ImageActor usage from automated-tests
Change-Id: Ia298a3d5dfe3449606151da70df139c42f864323
Adeel Kazmi [Tue, 19 Apr 2016 10:37:44 +0000 (11:37 +0100)]
Synchronized Automated Tests with dali-core
Change-Id: I7d743f9dd1fdb118b2308a2195f83d25407e62ae
Richard Huang [Fri, 19 Feb 2016 17:30:08 +0000 (17:30 +0000)]
Flexbox UI control implementation
Change-Id: I70217a6e04cba71fcf5eaeaf0b10cb82b116a4e8
Paul Wisbey [Mon, 18 Apr 2016 16:42:44 +0000 (17:42 +0100)]
Publish the OVERSHOOT_SIZE property in Scrollable
Change-Id: If09ff5491b0c098d34300872f26957eab31f9f59
Adeel Kazmi [Mon, 18 Apr 2016 14:59:48 +0000 (07:59 -0700)]
Merge "Remove sys-string and use dali-toolkit po files (sys-string package will be deleted from platform)" into devel/master
Ferran Sole [Wed, 6 Apr 2016 09:41:28 +0000 (10:41 +0100)]
Rendering API clean-up
Change-Id: I282a24900e667bdc29ba45cf95d7e22457df137c
Adam Bialogonski [Fri, 15 Apr 2016 13:59:27 +0000 (14:59 +0100)]
DALi Version 1.1.30
Change-Id: Ic29d1a311c36fbc6e4c01670e636d61d0332ed9a
Heeyong Song [Mon, 11 Jan 2016 05:53:53 +0000 (14:53 +0900)]
Remove sys-string and use dali-toolkit po files
(sys-string package will be deleted from platform)
Change-Id: I8534096c80e060f15313944fe077b62c28689a61
Adeel Kazmi [Thu, 14 Apr 2016 17:05:41 +0000 (18:05 +0100)]
(PageTurnView) Remove unrequired cull-face.h
Change-Id: I7e9f640384374bb127bb82348e3153b6a412fe9f
Xiangyin Ma [Thu, 17 Dec 2015 16:52:15 +0000 (16:52 +0000)]
Stop using ImageActor in EffectsView and ImageFilters
Change-Id: Icc8793ab46b8e6c10a5f10bace53304b5f7d26b0
Adeel Kazmi [Tue, 12 Apr 2016 15:13:39 +0000 (08:13 -0700)]
Merge "Stop using ImageActor in PageTurnView" into devel/master
Paul Wisbey [Tue, 12 Apr 2016 10:37:41 +0000 (03:37 -0700)]
Merge changes I150e1a74,Ie6d24150,I91081f5a into devel/master
* changes:
TextModel - Conversion from characters to glyphs.
TextModel - Create paragraph info for a given range of characters inside a text.
Text - Small fixes.
Adeel Kazmi [Mon, 11 Apr 2016 11:23:29 +0000 (12:23 +0100)]
Remove Unnecessary OnButton methods in the button implementations
Change-Id: I5fd0c0149513dd40c1eace72afa49ed47a9782cf
Adeel Kazmi [Fri, 8 Apr 2016 16:55:28 +0000 (17:55 +0100)]
Remove OnControl methods & add up-calls
Additionally, correctly sets the background renderer size when OnSizeSet is called.
Change-Id: I6952e0a2e317b54bdb28adf2b013ca1244595522
Victor Cebollada [Mon, 11 Apr 2016 08:47:10 +0000 (09:47 +0100)]
TextModel - Conversion from characters to glyphs.
* Pass the glyph index to the methods that calculates the conversion tables.
Change-Id: I150e1a747dea196b9b3669d0e8b02d834b41d28f
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Victor Cebollada [Mon, 21 Mar 2016 08:42:21 +0000 (08:42 +0000)]
TextModel - Create paragraph info for a given range of characters inside a text.
Change-Id: Ie6d241502e78a99a5be3343bf4da2761e6547d4c
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Victor Cebollada [Mon, 11 Apr 2016 07:56:41 +0000 (08:56 +0100)]
Text - Small fixes.
* Some comments updated.
* const's added.
* numberOfChars --> numberOfCharacters
* include guard changed in text-run-container.h
Change-Id: I91081f5ad2de071aff294435ab43b09e782f5ca7
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Xiangyin Ma [Wed, 25 Nov 2015 18:15:05 +0000 (18:15 +0000)]
Stop using ImageActor in PageTurnView
Change-Id: Id919c0ec67faf0afcabd0dbc4ff895cdab4ff52f
Xiangyin Ma [Fri, 8 Apr 2016 10:24:40 +0000 (11:24 +0100)]
DALi Version 1.1.29
Change-Id: I6930c43249d153112a2d77bd09ed2c11383a337c
Paul Wisbey [Thu, 7 Apr 2016 12:48:51 +0000 (05:48 -0700)]
Merge "Fixed normal mapping shader for model3d-view control" into devel/master
Paul Wisbey [Thu, 7 Apr 2016 09:09:34 +0000 (02:09 -0700)]
Merge "Fix for font validation." into devel/master
Ferran Sole [Wed, 6 Apr 2016 11:35:14 +0000 (12:35 +0100)]
Fixed normal mapping shader for model3d-view control
-Normal mapping shader was using a wrong view vector to compute the halfway vector between camera and light
-Removed some unnecessary operations
Change-Id: Ic86a04629f8f8aa3d44bf1f374dbc19ab8dbdf0c
Adeel Kazmi [Tue, 5 Apr 2016 15:49:32 +0000 (16:49 +0100)]
(Control) Remove color & filename parsing in map for background
This will not break backwards compatibility as the previous code followed a different path anyway.
Change-Id: I4a7250297fe6c1b2351bf899f2ec06f3154f51cf
Victor Cebollada [Tue, 5 Apr 2016 08:40:49 +0000 (09:40 +0100)]
Fix for font validation.
Bug fixed when:
* There are different texts.
* No font's family is set to the texts.
* Texts are not supported by the default font.
* Texts are set different sizes.
Only one default font (with only one size) was cached per script.
Change-Id: Ifdc1691b797432521c16f236769c127ab1848433
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Paul Wisbey [Tue, 5 Apr 2016 15:14:51 +0000 (08:14 -0700)]
Merge "Fixed testcases using sampler uniforms" into devel/master
Adeel Kazmi [Mon, 4 Apr 2016 17:33:26 +0000 (10:33 -0700)]
Merge "GradientRenderer Property name changes and stopOffset has default" into devel/master
David Steele [Mon, 4 Apr 2016 15:31:21 +0000 (16:31 +0100)]
Fixed testcases using sampler uniforms
Change-Id: I110b07103484dee4fc685596b2bfffbdc5d99fdb
Xiangyin Ma [Mon, 21 Dec 2015 18:03:04 +0000 (18:03 +0000)]
Remove more ImageActors from Toolkit
Change-Id: Idc4e89e816ed271b71befb22d469912775e2ee16
Agnelo Vaz [Fri, 1 Apr 2016 14:46:51 +0000 (15:46 +0100)]
GradientRenderer Property name changes and stopOffset has default
gradient prefix removed from Properties as redundant in the GradientRenderer class
StopOffset now has default values of 0.0 and 1.0 so not an essential property to set
Programming guide and tests updated to reflect these changes.
New utc added for testing stopOffset defaults
Change-Id: I1edfac96970dd648431825824c8bedf9275f4203
Yoonsang Lee [Wed, 27 Jan 2016 23:11:57 +0000 (08:11 +0900)]
Update doxygen groups and overview description
- Merge "Focus Manager" & "Accessibility Manager" groups into "Managers"
- Update overview of DALi
- Update overview of DALi Toolkit
Change-Id: Iad7d693276b1c13274305a0c73b7ca49e54d9dc4
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>
Paul Wisbey [Thu, 31 Mar 2016 13:58:36 +0000 (06:58 -0700)]
Merge "Fix for text cursor." into devel/master
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>
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
Adeel Kazmi [Wed, 30 Mar 2016 17:31:26 +0000 (10:31 -0700)]
Merge "Stop Overriding Actor::Add() & Actor::Remove()" into devel/master
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>
Xiangyin Ma [Wed, 23 Mar 2016 16:28:58 +0000 (16:28 +0000)]
Stop Overriding Actor::Add() & Actor::Remove()
Change-Id: I81213f1888d0469eb5b02bc5e9686d70ba79f113
Adeel Kazmi [Thu, 24 Mar 2016 16:35:30 +0000 (09:35 -0700)]
Merge "DALi Version 1.1.27" into devel/master
Tom Robinson [Thu, 24 Mar 2016 15:49:09 +0000 (15:49 +0000)]
DALi Version 1.1.27
Change-Id: Iea5cd11685c90dc45c29d4f6096305e3e8c18242
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
Xiangyin Ma [Tue, 22 Mar 2016 18:47:13 +0000 (18:47 +0000)]
Programming guide of SVG Renderer
Change-Id: I1ce2607ebd5ba4fcc7ff40fbe3795620f3c034e1
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>
Xiangyin Ma [Mon, 22 Feb 2016 15:52:12 +0000 (15:52 +0000)]
SVG support for ImageView ( CPU rendering version )
Change-Id: I220bb575d2f66deca04106b091dd15aaed34302f
Paul Wisbey [Mon, 21 Mar 2016 17:06:40 +0000 (17:06 +0000)]
PropertyBuffer SetData clean-up
Change-Id: Ie99400f090ee5516f8fcb90e8fea307fe41bbf48
Richard Huang [Fri, 18 Mar 2016 13:10:01 +0000 (13:10 +0000)]
DALi Version 1.1.26
Change-Id: I420d404c5ea446ade9ebb0085a3bf46dc525c1fc
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
Paul Wisbey [Mon, 14 Mar 2016 13:11:26 +0000 (06:11 -0700)]
Merge "Added Emscripten guide" into devel/master
Nick Holland [Fri, 11 Mar 2016 15:02:35 +0000 (15:02 +0000)]
DALi Version 1.1.25
Change-Id: I8b92be804f4af7e50413b26add1db324c6048fd4
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>
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
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>
Ferran Sole [Mon, 7 Mar 2016 09:07:46 +0000 (09:07 +0000)]
DALi Version 1.1.24
Change-Id: I2e067240be9283416dec5ab90a8ca9115735c820
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>
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>
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>
Ferran Sole [Thu, 18 Feb 2016 17:24:23 +0000 (17:24 +0000)]
Changes following deprecation of position inheritance modes
Change-Id: I2f47ceaa3766a56e4af7cb0627815642b0754a51
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>
David Steele [Fri, 26 Feb 2016 13:45:27 +0000 (13:45 +0000)]
DALi Version 1.1.23
Change-Id: I571ff7edd0ff2b24e804cab0db66b7167469dd97
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
Kimmo Hoikka [Thu, 25 Feb 2016 17:37:44 +0000 (09:37 -0800)]
Merge "Add Layer documentation" into devel/master
Richard Huang [Thu, 25 Feb 2016 16:18:12 +0000 (16:18 +0000)]
Fix animations in JavaScript mesh API examples
Change-Id: I0a26ec4f05fbac468debd40c9517c4fbd1879b69
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
Nick Holland [Wed, 3 Feb 2016 15:28:04 +0000 (15:28 +0000)]
Add Layer documentation
Change-Id: I9ab1a03bd62aa50382aad4b3d11ca23becf0dac8
Adeel Kazmi [Fri, 19 Feb 2016 11:16:42 +0000 (03:16 -0800)]
Merge "DALi Version 1.1.22" into devel/master
Agnelo Vaz [Fri, 19 Feb 2016 10:52:26 +0000 (10:52 +0000)]
DALi Version 1.1.22
Change-Id: I9d3e2add7cf059f5aef0cccb5bdad516c7c2863c
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
Paul Wisbey [Wed, 17 Feb 2016 11:02:16 +0000 (11:02 +0000)]
Set DPI when testing font-client
Change-Id: Ifd4fcf18225ea175195e91593b1395c24c7e4c7b
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
Seoyeon Kim [Wed, 3 Feb 2016 10:19:20 +0000 (19:19 +0900)]
Update public header comments of DALi toolkit
Change-Id: If6028b673ef00ea8ad115975fa7db88c18d579c1
Adeel Kazmi [Fri, 12 Feb 2016 10:32:22 +0000 (10:32 +0000)]
DALi Version 1.1.21
Change-Id: I581a09c94c0b57077e94423e74ce9c635c201e16
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>
Xiangyin Ma [Fri, 29 Jan 2016 16:31:30 +0000 (16:31 +0000)]
Update following the changes of blending&culling options
Change-Id: I2a48b7d440b31f93ac2d8478f0ffe10ca417099d
Xiangyin Ma [Fri, 5 Feb 2016 08:53:13 +0000 (08:53 +0000)]
DALi Version 1.1.20
Change-Id: I64d80ae43dc3fe82e388f733d4e432953bd2dcde
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>
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
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
Tom Robinson [Fri, 29 Jan 2016 11:33:33 +0000 (11:33 +0000)]
DALi Version 1.1.19
Change-Id: I2ce108d82a29982255cb4e665b210113b5a6566f
Tom Robinson [Mon, 18 Jan 2016 15:50:28 +0000 (15:50 +0000)]
Fixed Builder not allowing nested maps for properties
Change-Id: I3652ae654cc549ed948f0d54da557bfac90bf78f
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
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
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
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
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
Paul Wisbey [Tue, 26 Jan 2016 14:33:58 +0000 (06:33 -0800)]
Merge "Fix for text's popup." into devel/master
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
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
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
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
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>
Kimmo Hoikka [Fri, 22 Jan 2016 18:16:47 +0000 (10:16 -0800)]
Merge "JavaScript binding for ScrollView" into devel/master
Richard Huang [Fri, 22 Jan 2016 13:28:59 +0000 (13:28 +0000)]
DALi Version 1.1.18
Change-Id: Ib6526ea8b5e67d128830f631003eb9e24083cc85
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
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
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>
Adeel Kazmi [Thu, 21 Jan 2016 11:15:39 +0000 (03:15 -0800)]
Merge "Update gbs build makefile for node addon" into devel/master
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
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>
David Steele [Tue, 12 Jan 2016 14:42:38 +0000 (14:42 +0000)]
Re-order StyleManager implementation file to match header
Change-Id: I4c55d156a1019e13b862617bda30a99bd0a093fb
projects / platform / core / uifw / dali-toolkit.git / log