Adeel Kazmi [Fri, 8 Jul 2016 16:52:43 +0000 (09:52 -0700)]
Merge "DALi Version 1.1.42" into devel/master
Agnelo Vaz [Fri, 8 Jul 2016 16:43:39 +0000 (17:43 +0100)]
DALi Version 1.1.42
Change-Id: Ic79ab1fd92fd9f24bc7a0399c9e7c8bfa8853e2a
Paul Wisbey [Fri, 8 Jul 2016 13:55:50 +0000 (06:55 -0700)]
Merge "Changed Atlas manager to use Dali::Texture instead of Dali::Atlas" into devel/master
Paul Wisbey [Fri, 8 Jul 2016 13:17:43 +0000 (06:17 -0700)]
Merge "Updated Model3dView control to use SetTexture" into devel/master
Ferran Sole [Thu, 7 Jul 2016 09:33:12 +0000 (10:33 +0100)]
Changed Atlas manager to use Dali::Texture instead of Dali::Atlas
Change-Id: I284d67c3ec3aa198bfe6565dc8dd838022ade19b
Adeel Kazmi [Fri, 8 Jul 2016 11:17:49 +0000 (04:17 -0700)]
Merge "(Automated Tests) Increase line coverage of Builder" into devel/master
Paul Wisbey [Fri, 8 Jul 2016 10:31:11 +0000 (03:31 -0700)]
Merge "Replaced Image with Texture in cube transition effect. All references to the Image type have been removed." into devel/master
Agnelo Vaz [Thu, 7 Jul 2016 19:28:33 +0000 (20:28 +0100)]
Removing unused internal button functions
Change-Id: I4637d28437b3d59e489b975f62bffd3b5be7e319
Adeel Kazmi [Thu, 7 Jul 2016 18:42:47 +0000 (19:42 +0100)]
(Automated Tests) Increase line coverage of Builder
Change-Id: Ia768c77c81fb948e162255371c386b1266eb8d4a
Agnelo Vaz [Thu, 7 Jul 2016 16:46:52 +0000 (17:46 +0100)]
Adding tests for checkbox
Increases line coverage from 59.8 to 79.4
Change-Id: I643d2016162b556e85e5fb38de1b056c62f05d87
adam.b [Wed, 6 Jul 2016 16:11:33 +0000 (17:11 +0100)]
Replaced Image with Texture in cube transition effect. All references to the Image type have been removed.
Change-Id: I11a8b29865a1881139e757fe47732b82512052ba
Kimmo Hoikka [Thu, 7 Jul 2016 12:56:00 +0000 (05:56 -0700)]
Merge "Fix bug in mesh-renderer which failed to render using textureless shader" into devel/master
Tom Robinson [Wed, 6 Jul 2016 18:14:33 +0000 (19:14 +0100)]
Updated Model3dView control to use SetTexture
Change-Id: I5799a2bbe540b9297de3e0b5581f0f89d93fa107
Paul Wisbey [Wed, 6 Jul 2016 14:31:17 +0000 (07:31 -0700)]
Merge "Text - Stop destroying the text renderer when text decoration is updated." into devel/master
Ferran Sole [Wed, 6 Jul 2016 10:53:59 +0000 (11:53 +0100)]
Fix bug in mesh-renderer which failed to render using textureless shader
Change-Id: Ief03f64697fcf11750a2dd2bc3bea1255fe33f13
Seoyeon Kim [Wed, 6 Jul 2016 11:29:03 +0000 (20:29 +0900)]
Update dali-toolkit-doc.h for new features
- Add flex-container, video view, and slider to doxygen group
Change-Id: I83ab3f741ee36cadbbcf209e13803b8b44c3551e
Adeel Kazmi [Wed, 6 Jul 2016 11:07:42 +0000 (04:07 -0700)]
Merge "Cleaning up RendererFactory API" into devel/master
Victor Cebollada [Tue, 5 Jul 2016 12:42:37 +0000 (13:42 +0100)]
Text - Stop destroying the text renderer when text decoration is updated.
Currently the text renderer is destroyed every time the text or
the decoration is updated.
This patch changes the Text::Controller::Relayout() method to return
and enum type. The text controls can avoid the destruction of the text
renderer if the text model is not updated.
Change-Id: Ie0ccbc7e1c7e64dba778059c12bd7a6625de53cc
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Ferran Sole [Fri, 1 Jul 2016 08:29:49 +0000 (09:29 +0100)]
Modifed mesh-renderer to use new texture API
* mesh-renderer is now using the new texture API
* Added a property to specify whether to use mipmapping on the textures
Change-Id: Ic654279a97dfb0efaad2833bac0d497160faaf53
David Steele [Mon, 4 Jul 2016 16:33:01 +0000 (09:33 -0700)]
Merge "(Touch) Updated programming guide, Automated Tests & KeyboardFocusManager to use new Touch API" into devel/master
Paul Wisbey [Mon, 4 Jul 2016 16:28:53 +0000 (09:28 -0700)]
Merge "Fix for text controller (IMF callback)." into devel/master
adam.b [Mon, 20 Jun 2016 16:31:14 +0000 (17:31 +0100)]
Cleaning up RendererFactory API
Change-Id: I5d7ad002962ef4a757b5d2900d25d272873060bc
Adeel Kazmi [Mon, 4 Jul 2016 14:35:33 +0000 (15:35 +0100)]
(Touch) Updated programming guide, Automated Tests & KeyboardFocusManager to use new Touch API
Change-Id: I886c10891e47ea65b41165912bb823bdcef57f0d
Adeel Kazmi [Mon, 4 Jul 2016 12:01:13 +0000 (13:01 +0100)]
(Touch) Using new Touch API in all controls
Change-Id: I62f9007a40949401de48a325dbce9e0228271944
Paul Wisbey [Fri, 1 Jul 2016 13:49:44 +0000 (06:49 -0700)]
Merge "DALi Version 1.1.41" into devel/master
adam.b [Fri, 1 Jul 2016 13:28:44 +0000 (14:28 +0100)]
DALi Version 1.1.41
Change-Id: I4896c86ef1e79653c9f11c25eca6fdfb999fa504
Victor Cebollada [Mon, 27 Jun 2016 10:03:53 +0000 (11:03 +0100)]
Fix for text controller (IMF callback).
* Do not retrieve the cursor position when the DELETE SURROUNDING callback is called.
When adding characters to an empty text-field, the IMF manager removes first the
pre-edited text and adds the pre-edited text plus the new character.
This patch fixes a flickering issue seen in the virtual keyboard. If the cursor
position is retrieved when the pre-edited text is deleted, the virtual keyboard
is shown with upper case characters and shown again in lower case when the text
is added.
Change-Id: Ifd3a01f2e2c211c15a41858ec0152c12f7a1188c
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Victor Cebollada [Wed, 22 Jun 2016 07:53:34 +0000 (08:53 +0100)]
Stop setting a max fixed size for the emojis.
* Emojis will use the point size set by the user to calculate their metrics.
Change-Id: I42a1369520df501bf7d73ad0fabe0d879ed40f8e
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Adeel Kazmi [Thu, 30 Jun 2016 10:44:06 +0000 (03:44 -0700)]
Merge "Updated test cases for increased coverage" into devel/master
Kimmo Hoikka [Wed, 29 Jun 2016 16:54:59 +0000 (09:54 -0700)]
Merge "Changes following patch "Added support for compressed texture upload to Render::NewTexture"" into devel/master
David Steele [Wed, 29 Jun 2016 15:00:17 +0000 (16:00 +0100)]
Updated test cases for increased coverage
Fixed minor bug in super-blur-view,
removed dead code from accessibility manager.
Uncovered chaining issue with render tasks, but left test passing for the moment.
(Needs further investigation)
Change-Id: I4875183aa1b587a9b7228944a38796c33d15b367
On branch devel/master
nothing to commit, working directory clean
Adeel Kazmi [Wed, 29 Jun 2016 09:28:08 +0000 (02:28 -0700)]
Merge "Fix Svace issue" into devel/master
Ferran Sole [Tue, 28 Jun 2016 15:51:10 +0000 (16:51 +0100)]
Changes following patch "Added support for compressed texture upload to Render::NewTexture"
Change-Id: If323b7a0a177b3e504d46a8c879f9ed7d11ccfad
Adeel Kazmi [Tue, 28 Jun 2016 11:43:48 +0000 (04:43 -0700)]
Merge "Updated comment to remove copy+paste error." into devel/master
Andrew Poor [Wed, 22 Jun 2016 16:15:10 +0000 (17:15 +0100)]
Updated comment to remove copy+paste error.
Change-Id: Ifd9074a212db7e9a21bcb8a31f0ff54a0fc27b39
Seoyeon Kim [Tue, 28 Jun 2016 04:53:07 +0000 (13:53 +0900)]
Fix Svace issue
- Return value of a function GetArray() has to be checked for NULL at gradient-renderer.cpp
Change-Id: I32ec6c5de941b19d510b2aa35aa06a10d7314dc6
Seoyeon Kim [Tue, 21 Jun 2016 08:27:39 +0000 (17:27 +0900)]
Fix Svace warning issue
- Missing break in switch statement at text-effects-style.cpp
- Prevention of Null pointer dereference at builder-impl.cpp
Change-Id: I1fcf28fbc1aff8c4b5e707f2bf79c6247112bae5
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
Victor Cebollada [Fri, 24 Jun 2016 07:39:47 +0000 (08:39 +0100)]
DALi Version 1.1.40
Change-Id: Ia2784eb4450af29f932abaaf609d8e23da35b729
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
David Steele [Thu, 23 Jun 2016 10:56:10 +0000 (11:56 +0100)]
Addition of new test cases
Change-Id: If9545be92a81324b6fb51dec088b77e084a0cf70
Andrew Poor [Wed, 1 Jun 2016 15:49:24 +0000 (16:49 +0100)]
Implemented a mesh renderer to display 3D objects from files.
Change-Id: I6adb4086a563b45e5644302181c4b898f2d5f100
Adeel Kazmi [Wed, 22 Jun 2016 11:36:31 +0000 (12:36 +0100)]
Put third party source files in separate folder & exclude from coverage
Change-Id: Iaa1333b06aaf596d47b901b28cafd4f19ab1613b
David Steele [Mon, 20 Jun 2016 13:51:21 +0000 (14:51 +0100)]
Re-added test files to build and fixed failing tests
Test cases had been commented out for speed of build/execution
and accidentally left commented out when checked in... Uncommented
all the test cases.
Consequently, some test cases are failing following a merge of Dali-Core's
test stub files - have now upgraded the test platform for GlAbstraction
to enable finding gl calls by method and named parameter.
Change-Id: I665038bd9983ef326778133ae5846472943eb873
Signed-off-by: David Steele <david.steele@samsung.com>
Victor Cebollada [Fri, 17 Jun 2016 15:37:24 +0000 (16:37 +0100)]
Fix for the surrounding info send to the IMF manager.
* It sends the cursor position when the or the selection
handles are updated.
* It stops sending the surrounding text as the IMF manager
does nothing with it.
Change-Id: I439faa41df5aa060b7822a3cc15eccefb0a10e6e
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Victor Cebollada [Tue, 14 Jun 2016 16:00:25 +0000 (17:00 +0100)]
Fix for multi-language support.
* Characters common for all scripts (i.e. white spaces or zero width joiners)
may be set a different font than the surrounding characters.
In some languages it causes a group of characters to be shaped in different
groups of glyphs.
Change-Id: I0605572084252f9f3e8dab76a99d89c565924986
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Paul Wisbey [Fri, 17 Jun 2016 14:01:32 +0000 (07:01 -0700)]
Merge "Corrected popup position in text decorator when grab handle is active" into devel/master
Ferran Sole [Fri, 17 Jun 2016 11:19:28 +0000 (12:19 +0100)]
Corrected popup position in text decorator when grab handle is active
Change-Id: I05457a35b56a5c01a589f71a2df853d3c848b51f
Kimmo Hoikka [Fri, 17 Jun 2016 12:25:26 +0000 (05:25 -0700)]
Merge "(Automated Tests) Synchronised common files with Core" into devel/master
Adeel Kazmi [Fri, 17 Jun 2016 10:43:33 +0000 (11:43 +0100)]
DALi Version 1.1.39
Change-Id: Ie2be0791a607c934efc2bac86282381a84edcbc4
Adeel Kazmi [Fri, 17 Jun 2016 10:22:57 +0000 (11:22 +0100)]
(Automated Tests) Synchronised common files with Core
Change-Id: I212c9242a9463deee1581f1cdb7ecc30e63e7a57
Adeel Kazmi [Fri, 17 Jun 2016 08:52:56 +0000 (09:52 +0100)]
Remove unused static function from V8
Change-Id: Ied303b6f0df2c2cf4f8b2b17508dad0351f63161
Adeel Kazmi [Thu, 16 Jun 2016 16:46:08 +0000 (17:46 +0100)]
Changes after touch changes to Core
Change-Id: Ie054c75df998a295d21af549420359d9c2684364
Paul Wisbey [Thu, 16 Jun 2016 16:46:43 +0000 (09:46 -0700)]
Merge "Fixed bug in model3d-view control" into devel/master
taeyoon [Thu, 16 Jun 2016 08:56:04 +0000 (01:56 -0700)]
Merge "Add video view control" into devel/master
Seoyeon Kim [Mon, 23 May 2016 08:52:26 +0000 (17:52 +0900)]
Moved Slider to the public API
Fixed comments and added @SINCE_1_1.39 macros, doxygen groups.
Change-Id: Id276582294d8dddc83bec568fd396a9b6fea86f4
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
taeyoon [Mon, 28 Mar 2016 09:28:50 +0000 (18:28 +0900)]
Add video view control
Add VideoView class for video playback
Change-Id: I5ed6e35571b773e0a807c22d4a2cbf08763a9143
Ferran Sole [Tue, 14 Jun 2016 07:27:39 +0000 (08:27 +0100)]
Fixed bug in model3d-view control
Diffuse texture was being added to the TextureSet when illumination type was
DIFFUSE. Diffuse shader doesn't use any textures so the TextureSet should be empty.
Change-Id: I521100cb4e399f0ef673e59b612cde4bec58e219
Kimmo Hoikka [Fri, 10 Jun 2016 17:58:35 +0000 (18:58 +0100)]
Remove unnecessary SlotDelegate from Feedback
Change-Id: I5df8ee195c5d4642221c74d38cc31c9a98387ed0
David Steele [Mon, 13 Jun 2016 10:27:35 +0000 (03:27 -0700)]
Merge "(Builder) Set property without checking property type" into devel/master
Paul Wisbey [Mon, 13 Jun 2016 10:19:34 +0000 (03:19 -0700)]
Merge "Removed GetRenderHasRendered() test from the toolkit autotest" into devel/master
Adeel Kazmi [Fri, 15 Apr 2016 16:31:18 +0000 (17:31 +0100)]
(Builder) Set property without checking property type
Removed actor parent-origin & anchor point setup as well, as that is now done in Actor itself
Change-Id: I628369926380d23842a7a33251eff2faa2371adb
David Steele [Tue, 24 May 2016 18:28:39 +0000 (19:28 +0100)]
Updated rules for generating internal doxygen.
Added config to generate QT help (for use with QtCreator IDE)
Change-Id: I4967c0329c7690089f7864835c6f5f4baac07f19
Signed-off-by: David Steele <david.steele@samsung.com>
Xiangyin Ma [Fri, 10 Jun 2016 10:48:13 +0000 (11:48 +0100)]
DALi Version 1.1.38
Change-Id: I96ed5d423f159e5822543daf1dfdee466fd58510
adam.b [Thu, 9 Jun 2016 18:32:46 +0000 (19:32 +0100)]
Removed GetRenderHasRendered() test from the toolkit autotest
Change-Id: Ic6557745621cb837ff193410cc603a1499e28699
Xiangyin Ma [Tue, 31 May 2016 14:26:42 +0000 (15:26 +0100)]
Remove ImageActor from comments and variable names
Change-Id: I4d1b43de5f9542b914a893a10514293d5bb950c2
Kimmo Hoikka [Fri, 3 Jun 2016 16:13:05 +0000 (09:13 -0700)]
Merge "Updates following the PixelData change" into devel/master
Tom Robinson [Fri, 3 Jun 2016 13:33:36 +0000 (14:33 +0100)]
DALi Version 1.1.37
Change-Id: If2a4356e2a421d08f838d73046d4f56e525afbd9
Xiangyin Ma [Thu, 26 May 2016 15:52:47 +0000 (16:52 +0100)]
Updates following the PixelData change
Change-Id: Id5274bf0e4da9a4b7c3f4be2f79829065ac29f91
Paul Wisbey [Thu, 2 Jun 2016 17:15:21 +0000 (10:15 -0700)]
Merge "Fix for object loader not handling flags correctly." into devel/master
Paul Wisbey [Thu, 2 Jun 2016 17:02:37 +0000 (10:02 -0700)]
Merge "Selection box fix for multi-line." into devel/master
Paul Wisbey [Thu, 2 Jun 2016 17:02:04 +0000 (10:02 -0700)]
Merge "Fix for text handle positioning." into devel/master
Agnelo Vaz [Thu, 2 Jun 2016 12:13:40 +0000 (13:13 +0100)]
Fixing Gap in Text Scrolling
The patch to make the gap public api take an int was causing a problem in the shader
Now casting to a float before used by shader
Change-Id: I57eda6777795f679225921eddc23ae2a3180cf75
Seoyeon Kim [Thu, 2 Jun 2016 06:07:09 +0000 (23:07 -0700)]
Merge "Prevention for being assigned NULL value" into devel/master
Victor Cebollada [Wed, 1 Jun 2016 06:34:05 +0000 (07:34 +0100)]
Selection box fix for multi-line.
Change-Id: Ib2165c7426e471d2ddf964c2b95568f2d10e70a8
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Victor Cebollada [Tue, 31 May 2016 15:41:20 +0000 (16:41 +0100)]
Fix for text handle positioning.
Change-Id: I5777f77ab30b301f9fcb2a7b5637b42bcebc09ab
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Paul Wisbey [Wed, 1 Jun 2016 08:40:34 +0000 (01:40 -0700)]
Merge "APIs for text editor." into devel/master
Andrew Poor [Mon, 16 May 2016 11:41:19 +0000 (12:41 +0100)]
Fix for object loader not handling flags correctly.
Change-Id: I287d1156e04c804ef0eeb1830f0b1c970739be3c
Victor Cebollada [Tue, 19 Apr 2016 14:54:23 +0000 (15:54 +0100)]
APIs for text editor.
Change-Id: Id18e9f4f8d24f0f1c25f833962ed4cfaf4f7fe02
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Victor Cebollada [Wed, 4 May 2016 13:38:12 +0000 (14:38 +0100)]
Multi-line text. Cursor hit and cursor's position.
Change-Id: I28f664ea7d1dfed61fcd4e69a3de8ec850b4df58
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Seoyeon Kim [Fri, 27 May 2016 01:14:28 +0000 (10:14 +0900)]
Prevention for being assigned NULL value
- Pointer 'v8Value' may have NULL value
Change-Id: I5ff68d3b78cab271b443b58bb470985e906b8c6a
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
Victor Cebollada [Fri, 13 May 2016 07:08:05 +0000 (08:08 +0100)]
Remove alignment from text controller.
Change-Id: Id5adba2797c32b2613cb5c809f97d7c201e236db
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Paul Wisbey [Fri, 27 May 2016 15:23:57 +0000 (08:23 -0700)]
Merge "Text - Move cursor's position related code to a different file." into devel/master
Paul Wisbey [Fri, 27 May 2016 15:23:17 +0000 (08:23 -0700)]
Merge "Bidirectional conversion table for multiline." into devel/master
Paul Wisbey [Fri, 27 May 2016 14:31:51 +0000 (07:31 -0700)]
Merge "Fix for pre-edit text." into devel/master
Adeel Kazmi [Fri, 27 May 2016 12:35:27 +0000 (05:35 -0700)]
Merge "DALi Version 1.1.36" into devel/master
David Steele [Fri, 27 May 2016 12:19:25 +0000 (05:19 -0700)]
Merge "Obj Loader to use Dali::Vector" into devel/master
Richard Huang [Fri, 27 May 2016 11:20:54 +0000 (12:20 +0100)]
DALi Version 1.1.36
Change-Id: I2a67df6d4eb7b4c5081d06f6c22dca72a62b8bd7
Victor Cebollada [Wed, 4 May 2016 08:11:56 +0000 (09:11 +0100)]
Text - Move cursor's position related code to a different file.
* The goal is create functions that can be easily tested with test cases.
Change-Id: I1950365f8a5ce8d74532d738d5820fbc82382810
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Victor Cebollada [Thu, 19 May 2016 13:44:40 +0000 (14:44 +0100)]
Bidirectional conversion table for multiline.
Change-Id: I10f0a2aec1f2af35c54bd322cde4f38166fe3cc2
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Victor Cebollada [Wed, 18 May 2016 07:42:11 +0000 (08:42 +0100)]
Fix for pre-edit text.
* When editing with predictive text enabled, the imf manager removes
the current pre-edited text and inserts the new string.
The new string can be longer if text is being added,
or smaller if text is being removed.
The text needs to be scrolled to the cursor position if text is smaller.
* Similarly, the text-controller can remove a group of characters when a
ImfManager::DELETESURROUNDING event arrives. The text also needs to
be scrolled to the cursor position.
* If text is not added at the end of the string, the text must not be scrolled
unless the cursor becomes not visible.
Change-Id: I6ed4b9ea122cd0b8fac4111c732625bf636eb52d
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Agnelo Vaz [Thu, 26 May 2016 14:14:19 +0000 (15:14 +0100)]
Obj Loader to use Dali::Vector
Was using new and delete on a c array
Was not clear that the array was for tangents and bi-tangents
Change-Id: Id693d8dcb4215975c0fcc8ab200a668a312c3a83
Paul Wisbey [Thu, 26 May 2016 15:51:52 +0000 (08:51 -0700)]
Merge "Added ScrollBar Indicator minimum size and padding properties" into devel/master
Xiangyin Ma [Thu, 12 May 2016 15:37:02 +0000 (16:37 +0100)]
ImageRenderer provides property to indicate async/sync resource loading
Change-Id: I282c0c9d5f904a6d7358b9997357664fbae90e97
Tom Robinson [Wed, 25 May 2016 15:14:35 +0000 (16:14 +0100)]
Added ScrollBar Indicator minimum size and padding properties
These 3 properties are floats, and can be set as follows (these are examples only):
scrollBar.SetProperty( ScrollBar::Property::INDICATOR_MINIMUM_HEIGHT, 20 );
scrollBar.SetProperty( ScrollBar::Property::INDICATOR_START_PADDING, 10 );
scrollBar.SetProperty( ScrollBar::Property::INDICATOR_END_PADDING, 10 );
Note: With a Vertical ScrollBar Direction: START and END padding properties refer to Top and Bottom respectively.
The defaults for all 3 properties is 0.
Change-Id: I79d9b28f36cca29a0e9115839cc5a5c70691bf65
Adeel Kazmi [Wed, 25 May 2016 08:28:27 +0000 (09:28 +0100)]
Removed redundant MOBILE Profile instructions from README
Change-Id: I331ab511f218df8a24f2bcecebde8f366fb7aa77
Tom Robinson [Tue, 24 May 2016 15:02:18 +0000 (16:02 +0100)]
Allows debug builds to be enabled for GBS builds
You can now enable a debug build of DALi via GBS by adding the following to your GBS build line:
--define "%enable_debug 1"
Details in README file.
Change-Id: Id7116cd8d1ccf94a2f71a280ecdcc1803f7281de
Adeel Kazmi [Fri, 20 May 2016 17:25:17 +0000 (10:25 -0700)]
Merge "Type registry helper: Toolkit change to correct Programming Guide for Custom Controls" into devel/master
Richard Huang [Fri, 20 May 2016 14:35:19 +0000 (15:35 +0100)]
Add child property registration for TableView
Change-Id: Ib043392dea1ea27cc65042d82927f6f8b909afa0
Tom Robinson [Tue, 17 May 2016 14:07:32 +0000 (15:07 +0100)]
Type registry helper: Toolkit change to correct Programming Guide for Custom Controls
Change-Id: Ifc633ae30502d416c40d3c1cfadc5d0600bc12e0
Agnelo Vaz [Fri, 20 May 2016 10:55:22 +0000 (11:55 +0100)]
Programming Guide, Fixing Styling level in main content page
Styling was under the animation heading when should be a heading of it's own
Change-Id: I7e54ea1f16a9a4c92e84dc2f75ea97c6aaa5c27d
Adeel Kazmi [Fri, 20 May 2016 10:25:45 +0000 (03:25 -0700)]
Merge "DALi Version 1.1.35" into devel/master
projects / platform / core / uifw / dali-toolkit.git / log