Richard Huang [Fri, 27 May 2016 11:21:50 +0000 (12:21 +0100)]
[dali_1.1.36] Merge branch 'devel/master'
Change-Id: I6a67d3a02dd57479adfc9fc26f6083c0b1c0e36b
Richard Huang [Fri, 27 May 2016 11:20:54 +0000 (12:20 +0100)]
DALi Version 1.1.36
Change-Id: I2a67df6d4eb7b4c5081d06f6c22dca72a62b8bd7
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
Nick Holland [Fri, 20 May 2016 10:18:09 +0000 (11:18 +0100)]
[dali_1.1.35] Merge branch 'devel/master'
Change-Id: I7971d40e610154e3cce808e3a409023db32edc10
Nick Holland [Fri, 20 May 2016 10:17:34 +0000 (11:17 +0100)]
DALi Version 1.1.35
Change-Id: I0c9f9d2e432de50df24f4717e3972004005d2f5c
Richard Huang [Fri, 20 May 2016 09:42:11 +0000 (10:42 +0100)]
Update JavaScript demo and programming guide for Flexbox
Change-Id: Ic1da8a763b352e67682c8954dc0c01e87437ce92
Adeel Kazmi [Thu, 19 May 2016 14:58:10 +0000 (07:58 -0700)]
Merge "Make FlexContainer as public API" into devel/master
Richard Huang [Tue, 10 May 2016 15:16:25 +0000 (16:16 +0100)]
Make FlexContainer as public API
Change-Id: Ieae39bee5056b9e45f1ed291fae7a6493fd6d7b0
Richard Huang [Wed, 10 Feb 2016 15:22:00 +0000 (15:22 +0000)]
Allow automatic registration of custom property in JavaScript
Change-Id: I0e857fea58f85fd55a2e0b729bc01a3b67549d37
Richard Huang [Wed, 18 May 2016 12:22:02 +0000 (13:22 +0100)]
Support for child properties registration in FlexContainer
Change-Id: I912146fe84748a789d4d02c44360dc875cc9a113
Agnelo Vaz [Mon, 11 Jan 2016 17:26:19 +0000 (17:26 +0000)]
Text auto scrolling documentation
Updated Property documentation in header file for TextLabel
Added AutoScrolling to programming guide
Change-Id: Icf4fc662976a2c1964f0ba7b43a88268fcf84fd4
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
Agnelo Vaz [Tue, 17 May 2016 13:07:00 +0000 (14:07 +0100)]
GetNaturalSize() to restore ControlSize after relayouting, Scrolling Gap from float to int
GetNaturalSize was changing the controlSize to MAX_FLOAT before relayout but only restoring the control width, now does height too.
Gap for AutoScrolling changed from float to int, don't want less than a pixel.
Change-Id: I0c1c391e5565eee8b45d4f28492129d1211d8de8
Adeel Kazmi [Tue, 17 May 2016 11:21:48 +0000 (04:21 -0700)]
Merge "Add CreatePropertyBuffer() back to test utils" into devel/master
Adeel Kazmi [Mon, 16 May 2016 17:16:41 +0000 (18:16 +0100)]
Fix issues with text scrolling & transition effects using GetVectorXY() incorrectly
Vector3::GetVectorXY() returns a ref (or a const ref). This is problematic in the files in this
patch because they are returning a ref to a temporary variable which then goes out-of-scope later
The fix is to just create a copy of the value on the stack rather than pass a ref to the temporary
variable.
Change-Id: I2e93748943487a677d394064b70c2b6afe983dbf
Xiangyin Ma [Mon, 16 May 2016 17:31:41 +0000 (18:31 +0100)]
Add CreatePropertyBuffer() back to test utils
Change-Id: Ifca4ac0df7c286cf637953cd99564358d44fd52a
Adeel Kazmi [Mon, 16 May 2016 13:21:38 +0000 (14:21 +0100)]
Updates following vector-wrapper include changes in core.
Change-Id: I976580ee02239eb80c46e1a8d7b51f342d029361
Xiangyin Ma [Thu, 12 May 2016 17:03:45 +0000 (18:03 +0100)]
Use Geometry::QUAD() in toolkit
Change-Id: I942e9b1d8c7722745a176f2d2e03de247c1935c1
Adeel Kazmi [Fri, 13 May 2016 14:34:48 +0000 (07:34 -0700)]
Merge "Auto Scrolling Text Label" into devel/master
Adeel Kazmi [Fri, 13 May 2016 11:14:36 +0000 (04:14 -0700)]
Merge "DALi Version 1.1.34" into devel/master
Agnelo Vaz [Thu, 14 Jan 2016 15:44:21 +0000 (15:44 +0000)]
Auto Scrolling Text Label
Single line horizontal scrolling
Direction of scrolling dependent on direction of text, LTR or RTL
Speed of scrolling, gap before wrapping and number of loops can be set by Property system.
Change-Id: I6abba8c0d3f3838bdd143b315687b13cb680e2f7
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
Ferran Sole [Fri, 13 May 2016 10:55:23 +0000 (11:55 +0100)]
[dali_1.1.34] Merge branch 'devel/master'
Change-Id: I4772dedf341ec019bec3c0200c44342ef60341b0
Ferran Sole [Fri, 13 May 2016 10:54:53 +0000 (11:54 +0100)]
DALi Version 1.1.34
Change-Id: I963e379bb58245841cc58b1178372c17f7b71d50
Seoyeon Kim [Tue, 10 May 2016 07:43:11 +0000 (16:43 +0900)]
Change 'char' type to 'signed char'
- In some build environments, like ARM architecture, 'char' without a signedness
qualifier can be interpreted as 'unsigned char', and it may result in
unexpected behavior.
Change-Id: Ib362f914f853638a954dc0f39e9b6fb19f7043a0
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
Seoyeon Kim [Wed, 11 May 2016 06:55:33 +0000 (15:55 +0900)]
Prevention of Null pointer dereference
Change-Id: I34c2b04710734965c6e4553de90c55339bb2a05d
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
Kimmo Hoikka [Thu, 12 May 2016 13:40:17 +0000 (06:40 -0700)]
Merge "Button's 'Actions' table documentation updated." into devel/master
Victor Cebollada [Thu, 12 May 2016 10:03:55 +0000 (11:03 +0100)]
Button's 'Actions' table documentation updated.
* Attributes description and a reference to the DoAction() method added
to the "buttonClick" action.
Change-Id: If27b489bb509fcc52190057bf30086aca6dbc5ce
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Paul Wisbey [Tue, 3 May 2016 18:15:17 +0000 (19:15 +0100)]
Add ItemView stopScrolling action
+ Added a property for choosing one of the built-in alpha functions,
for scroll-to animations
Change-Id: I536672d27d6aec1ad06a3051f4b76cb63bad7b5c
suhyung Eom [Thu, 12 May 2016 01:02:05 +0000 (18:02 -0700)]
Merge "Fixed clipboard disappearing issue on selection" into devel/master
Victor Cebollada [Wed, 11 May 2016 08:15:05 +0000 (09:15 +0100)]
TextLayout fix.
* Check the initial line capacity is not zero.
Change-Id: Ib8a9daceb8eab7acea9cde3c925937e3bf3c2928
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
suhyung Eom [Tue, 10 May 2016 23:14:14 +0000 (08:14 +0900)]
Fixed clipboard disappearing issue on selection
Signed-off-by: suhyung Eom <suhyung.eom@samsung.com>
Change-Id: I10a4d3cde28b196eb306d08c0d4a7c85976cc1c4
Victor Cebollada [Tue, 10 May 2016 10:29:54 +0000 (11:29 +0100)]
Text::Controller - Fix a crash when the point size property is changed in a text-label.
Change-Id: Iba4c34f6e1450e03e361bd70b8e2543f1e53dc7d
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Richard Huang [Mon, 9 May 2016 16:24:54 +0000 (17:24 +0100)]
Fix Render API for node addon
Change-Id: If7be284cdeecf61c7578d5b06282bbf00e8e96f7
Kimmo Hoikka [Mon, 9 May 2016 13:43:00 +0000 (06:43 -0700)]
Merge "JavaScript example for Flexbox" into devel/master
Richard Huang [Mon, 9 May 2016 09:05:39 +0000 (10:05 +0100)]
JavaScript example for Flexbox
Change-Id: Icc08e4f646ef016a24c08bcd726c5cdcd8ff95a0
Richard Huang [Fri, 6 May 2016 16:47:49 +0000 (17:47 +0100)]
Add programming guide for FlexContainer
Change-Id: Ifa2d6374dbe03208cadcca0a46403cead003dde1
Adeel Kazmi [Fri, 6 May 2016 14:52:06 +0000 (07:52 -0700)]
Merge "DALi Version 1.1.33" into devel/master
David Steele [Fri, 6 May 2016 14:48:00 +0000 (15:48 +0100)]
[dali_1.1.33] Merge branch 'devel/master'
Change-Id: Ic6fd89cf01a3c41395d7f8bc4b7f9500a5fd8433
David Steele [Fri, 6 May 2016 14:47:30 +0000 (15:47 +0100)]
DALi Version 1.1.33
Change-Id: I5e425d7281bb5c2a2abcf05736b493aa6b96bbe4
Adeel Kazmi [Thu, 5 May 2016 19:23:15 +0000 (20:23 +0100)]
(Automated Tests) Platform Abstraction now handles multiple resource requests
Change-Id: I04beb35818241ce0a3f0a2f343ecbc26ef781b2c
David Steele [Tue, 3 May 2016 18:21:55 +0000 (19:21 +0100)]
Updated programming guide to discuss AnimateTo/By and rotations
AnimateTo performs a slerp, so can't perform a full revolution;
AnimateBy does a linear interpolation of the passed in value, so
initializing it with an AxisAngle property value can perform more
than one revoltion.
Change-Id: I233840024556fe3844d321dd2577ef181e6d8e19
Signed-off-by: David Steele <david.steele@samsung.com>
Adeel Kazmi [Thu, 5 May 2016 14:34:21 +0000 (07:34 -0700)]
Merge "Svace issues." into devel/master
Richard Huang [Thu, 5 May 2016 10:32:07 +0000 (11:32 +0100)]
Remove flexPadding and flexBorder as DALi does not support box model
Change-Id: If4f7e9c241f288e1cf4cd23fcb88393ce7dd86bb
Victor Cebollada [Thu, 5 May 2016 07:38:17 +0000 (08:38 +0100)]
Svace issues.
* Fixes some text related svace issues.
Change-Id: I88f91a0d43981a99f070c800e446066e6deb8874
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Agnelo Vaz [Wed, 4 May 2016 15:34:22 +0000 (16:34 +0100)]
Button documentation changed for Action buttonClick
Now a description instead of an internal function name
Change-Id: I1961e58c47080a30ed2e2a8e2be77d4331b1be0a
Paul Wisbey [Fri, 22 Apr 2016 10:15:52 +0000 (11:15 +0100)]
Blending enum clean-up
We were previously using a mixture of BLEND and BLENDING in enums.
The order of the BLEND_FACTOR enums & string names was also inconsistent.
As a rule of thumb always use Blend & BLEND for namespaces & enums/constants
(not Blending or BLENDING)
Change-Id: I464f9471dd6fdd4f865a2c1362a7c874fc3c315c
Victor Cebollada [Mon, 25 Apr 2016 09:58:37 +0000 (10:58 +0100)]
TextModel - Remove the visual to logical conversion tables.
* After the latest patches the bidirectional line info is kept.
This info is used now to get the logical index from the visual index.
The logical cursor position is calculated for a given logical cursor position.
Both conversion tables (character and cursor position) have been removed.
Change-Id: Ifc79816c0044d2c2546adbbb30f4e7dc6ceb956c
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Xiangyin Ma [Fri, 29 Apr 2016 16:33:44 +0000 (17:33 +0100)]
Use pre-multiplied alpha format in GradientRenderer
Change-Id: Ic363699481c40dcb51c3ba9507be6f7458eb6d8c
Kimmo Hoikka [Fri, 29 Apr 2016 15:03:10 +0000 (08:03 -0700)]
Merge "Fixed bug in SetIndexBuffer for v8 plugin" into devel/master
Kimmo Hoikka [Fri, 29 Apr 2016 15:01:41 +0000 (08:01 -0700)]
Merge "Changes following "Remove API to set if a geometry requires writing to the depth buffer"" into devel/master
Ferran Sole [Wed, 27 Apr 2016 07:20:48 +0000 (08:20 +0100)]
Changes following "Remove API to set if a geometry requires writing to the depth buffer"
Change-Id: I5b7e52b898c28ba39a9e8813fd6ed3bff1afbd3b
Agnelo Vaz [Fri, 29 Apr 2016 08:11:23 +0000 (09:11 +0100)]
[dali_1.1.32] Merge branch 'devel/master'
Change-Id: Id870d98184d1dd0b6c77ce901dfdf6bf167304d5
Agnelo Vaz [Fri, 29 Apr 2016 08:10:27 +0000 (09:10 +0100)]
DALi Version 1.1.32
Change-Id: I438a3126a55c9c5831b720bbc36587595ec03721
David Steele [Thu, 28 Apr 2016 17:41:15 +0000 (10:41 -0700)]
Merge "(ImageView) Partially Restore Tizen 2.4 GetImage() functionality" into devel/master
Ferran Sole [Thu, 28 Apr 2016 16:58:42 +0000 (17:58 +0100)]
Fixed bug in SetIndexBuffer for v8 plugin
Change-Id: I09c8c148f4f2308a2e2b4b19d007db5d51d9ebbe
Adeel Kazmi [Thu, 28 Apr 2016 16:55:45 +0000 (17:55 +0100)]
Remove ImageActor usage from V8 plugin
Change-Id: I88eb6606b232e2cbca081933c8cebb7c87b084c1
Kimmo Hoikka [Thu, 28 Apr 2016 16:52:29 +0000 (09:52 -0700)]
Merge "Remove ImageActor usage from programming guide" into devel/master
Adeel Kazmi [Wed, 27 Apr 2016 13:41:46 +0000 (14:41 +0100)]
(ImageView) Partially Restore Tizen 2.4 GetImage() functionality
Change-Id: I6f501ee01d094e5889c7c713364b56645f00e8b9
Andrew Poor [Mon, 25 Apr 2016 14:23:34 +0000 (15:23 +0100)]
Fixed ObjLoader to handle textureless objects.
Change-Id: I1f9cea422a41ae549ccdeb7b2ea53935e9bdc2c4
Xiangyin Ma [Mon, 25 Apr 2016 12:24:15 +0000 (13:24 +0100)]
Remove ImageActor usage from programming guide
Change-Id: Ifabac0c8896ff96cd632c5b8ede72db9b21c76ff
Kimmo Hoikka [Thu, 28 Apr 2016 12:33:32 +0000 (05:33 -0700)]
Merge "Moved StyleManager to the public API" into devel/master
Adeel Kazmi [Thu, 28 Apr 2016 09:47:30 +0000 (02:47 -0700)]
Merge "Remove ImageActor from Builder & some doxygen update" into devel/master
Adeel Kazmi [Wed, 27 Apr 2016 15:38:28 +0000 (08:38 -0700)]
Merge "Fix doxygen errors and enable doxygen build for devel-api" into devel/master
David Steele [Mon, 25 Apr 2016 16:46:23 +0000 (17:46 +0100)]
Moved StyleManager to the public API
Cleaned up the API (removed Orientation code), fixed comments, added
@SINCE_1_1.32 macros, doxygen groups.
Change-Id: I954f627a3db63714471d8440b65fc1afbc8dc44e
Signed-off-by: David Steele <david.steele@samsung.com>
Xiangyin Ma [Wed, 27 Apr 2016 14:59:51 +0000 (15:59 +0100)]
Fix the buffer overflow issue in nanosvg
Change-Id: I8d0f25c48bf1d5d307d7642b249e3baebcf63d41
Richard Huang [Tue, 26 Apr 2016 15:58:18 +0000 (16:58 +0100)]
Fix doxygen errors and enable doxygen build for devel-api
Change-Id: I7c4ebd51be3ab73a544963a89cc1fc33d83e8435
Xiangyin Ma [Tue, 26 Apr 2016 16:54:59 +0000 (17:54 +0100)]
Remove ImageActor from Builder & some doxygen update
Change-Id: I0c41dec882acda9dc9990b5a1db51d783d9cb03f
Paul Wisbey [Wed, 27 Apr 2016 12:41:33 +0000 (05:41 -0700)]
Merge "Changes following "Make TextureSet a non property owner"" into devel/master
Adeel Kazmi [Tue, 26 Apr 2016 15:53:27 +0000 (08:53 -0700)]
Merge "Changed signal order for StyleManager" into devel/master
David Steele [Fri, 15 Apr 2016 16:32:04 +0000 (17:32 +0100)]
Changed signal order for StyleManager
With this change, StyleManager will first trigger an internal signal
that is picked up by all Controls, then will emit StyleChanged to
signal to the application that the theme or system fonts have changed
and that the styling has completed.
Change-Id: I54ced7ad5ffc08bf5e55c9895be03848bea6b7a6
Signed-off-by: David Steele <david.steele@samsung.com>
Ferran Sole [Tue, 26 Apr 2016 13:43:20 +0000 (14:43 +0100)]
Changes following "Make TextureSet a non property owner"
Change-Id: Id3045fd237fac263b309fac51cb39800b3b5ede6
David Steele [Wed, 20 Apr 2016 19:21:43 +0000 (20:21 +0100)]
Changed shadow view to turn position inheritance off for blur filter
Recent changes to transform have altered position inheritance meaning.
Turning off position inheritance for the actors used by the blur filter
ensures that the final image (this is an image -> image render task) is positioned
in the same place.
Change-Id: I6102e756fc7d581fc8ba2e882601ed8d6f117b09
Signed-off-by: David Steele <david.steele@samsung.com>
Paul Wisbey [Tue, 26 Apr 2016 13:00:26 +0000 (06:00 -0700)]
Merge "Changes following "Remove Geometry scene object"" into devel/master
Richard Huang [Mon, 25 Apr 2016 14:04:17 +0000 (15:04 +0100)]
Add test case for Flexbox layout algorithm
Change-Id: I50bdcbe847f097cda3db6cf8dd948e6d9ab96626
Adeel Kazmi [Mon, 25 Apr 2016 16:48:26 +0000 (09:48 -0700)]
Merge "Clarify the action propagation behaviour in custom control development guide" into devel/master
Richard Huang [Mon, 25 Apr 2016 12:54:30 +0000 (13:54 +0100)]
Clarify the action propagation behaviour in custom control development guide
Change-Id: I492c0e5275f89ea4370b5c22e33d4f1af4f4750f
Ferran Sole [Wed, 20 Apr 2016 15:10:35 +0000 (16:10 +0100)]
Changes following "Remove Geometry scene object"
Change-Id: Id177a9f248686d82898a05a865871983a64af885
Xiangyin Ma [Thu, 21 Apr 2016 18:11:50 +0000 (19:11 +0100)]
update the programming guide of ControlRenderer
Change-Id: I1b086f330a575da9901fac29690c5bdfb12071cb
Victor Cebollada [Mon, 25 Apr 2016 10:35:01 +0000 (11:35 +0100)]
Color segmentation - Comment updated.
Change-Id: I82991c2f9813e7888b139bce8faad95e4e944c77
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Victor Cebollada [Mon, 25 Apr 2016 07:38:52 +0000 (08:38 +0100)]
TextModel - Remove the logical to visual conversion table.
* Is not needed.
Change-Id: I19e208281bfe70dbf5abe7de37059b4d259ee0fb
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Victor Cebollada [Tue, 12 Apr 2016 15:03:40 +0000 (16:03 +0100)]
TextModel - Update only the edited paragraph when the style changes.
Change-Id: I5a6666dd2e3f20fc16a786efd43bef2fd766aea0
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Victor Cebollada [Mon, 18 Apr 2016 08:23:51 +0000 (09:23 +0100)]
TextModel - Update the color runs.
Change-Id: If392f542fb3ce75532e125c805968fcc76b475cb
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Victor Cebollada [Mon, 18 Apr 2016 10:58:55 +0000 (11:58 +0100)]
Whether to update the input style when text is removed.
* When predictve text is used the pre-edit text is removed
and inserted again with the new characters. This patch
avoids to update the input style when pre-edit text is
removed.
Change-Id: Ia4d266a10a7912b19efd4e1d27dea0d711dcea9b
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Victor Cebollada [Thu, 21 Apr 2016 14:01:46 +0000 (15:01 +0100)]
Refactor the Text::Controller::ClearFontData.
* This method clears completely some buffers of the model.
Then the Text::Controller::Impl::ClearModelData may access
the same buffers out of bounds causing a crash.
Change-Id: I1b50135c707354bd3037aabb63cded10ba2e6f2f
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Xiangyin Ma [Thu, 21 Apr 2016 10:01:08 +0000 (11:01 +0100)]
Select the renderer type based on the image url
Change-Id: I394fdccd108871aaa234dc95b3e7b98142a9e7c7
Agnelo Vaz [Fri, 22 Apr 2016 10:02:10 +0000 (11:02 +0100)]
Deprecating Button API in favour of using Properties or style file
Change-Id: I5c856b6ca53228b181efbed525babfb7a69ad5fb
Kimmo Hoikka [Fri, 22 Apr 2016 10:59:04 +0000 (03:59 -0700)]
Merge "Fix JavaScript error after Rendering API clean-up" into devel/master
Richard Huang [Fri, 22 Apr 2016 10:11:07 +0000 (11:11 +0100)]
Fix JavaScript error after Rendering API clean-up
Change-Id: Iec708cdbfe6d760a85e8039703e55ad6233e88ce
Adeel Kazmi [Fri, 22 Apr 2016 09:08:35 +0000 (10:08 +0100)]
[dali_1.1.31] Merge branch 'devel/master'
Change-Id: I644ed1b09b5a5f8b3ffeafde16d6fa537d0dfbd0
Adeel Kazmi [Fri, 22 Apr 2016 09:08:00 +0000 (10:08 +0100)]
DALi Version 1.1.31
Change-Id: I3753939f6f4b7cc36539b062f4d3370a60451bff
Victor Cebollada [Thu, 21 Apr 2016 13:38:50 +0000 (14:38 +0100)]
Move the toolkit-text-model into a folder in the internal side of the test cases.
Change-Id: Id09c79876077595ef129f236d5a6e6fde07bd20a
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Paul Wisbey [Thu, 21 Apr 2016 14:59:26 +0000 (07:59 -0700)]
Merge "TextController - Update the text model." into devel/master
projects / platform / core / uifw / dali-toolkit.git / log