Francisco Santos [Fri, 25 Aug 2017 10:48:47 +0000 (11:48 +0100)]
DALi Version 1.2.54
Change-Id: I6263a6bf14382dc026b8bffb78b8024a9648d8d7
Adeel Kazmi [Thu, 24 Aug 2017 10:55:31 +0000 (10:55 +0000)]
Merge "Added option to test harness execution to only summarize failures" into devel/master
David Steele [Wed, 23 Aug 2017 18:36:26 +0000 (19:36 +0100)]
Added option to test harness execution to only summarize failures
Change-Id: I6c235eb492302c5ee9fb4b85f51d50a7c20ac7be
Adeel Kazmi [Wed, 23 Aug 2017 15:25:55 +0000 (16:25 +0100)]
(TextLabel) Added component properties for Text Color
Also fixed the getter for TEXT_COLOR
Change-Id: I993ff3c289ccb703d1c95874001f882fd4a3e7eb
Richard Huang [Tue, 22 Aug 2017 15:21:01 +0000 (16:21 +0100)]
Fix the padding issue while text is scrolling in TextLabel
Change-Id: I519f1c8b17aaa5b698a711dd3745b0e282b9aaea
Victor Cebollada [Mon, 21 Aug 2017 14:28:13 +0000 (15:28 +0100)]
Ensure all users can run the unit test cases on the same machine.
Change-Id: Ibda920af96500256e99aa690534b980f0080a28a
Signed-off-by: Victor Cebollada <v.cebollada@ex1.seri.co.uk>
Richard Huang [Fri, 18 Aug 2017 10:28:36 +0000 (11:28 +0100)]
Change filter mode in TextLabel to improve quality while scaling
Change-Id: Ifc2c5a1a592d24851db2b2703d469b8797595a0b
Victor Cebollada [Fri, 18 Aug 2017 09:20:47 +0000 (10:20 +0100)]
DALi Version 1.2.53
Change-Id: I5a78bc5589794a9fff46485970299da29790c397
Adeel Kazmi [Thu, 17 Aug 2017 15:03:04 +0000 (15:03 +0000)]
Merge "Fix for multi-language support." into devel/master
Richard Huang [Tue, 27 Jun 2017 15:37:17 +0000 (16:37 +0100)]
Refactor TextLabel to use text visual
Change-Id: Ia3f55571721cd988623200fb36bc47e1ee06f932
Victor Cebollada [Tue, 15 Aug 2017 14:59:20 +0000 (15:59 +0100)]
Fix for multi-language support.
* Fixes the issue when a font doesn't support all the glyphs of the script.
i.e a font validated for the CJK script may contain glyphs for the chinese language but not for the Japanese.
Uses the new IsCharacterSupportedByFont() method added to the font client.
Change-Id: I5f6e125298605d170de2d31f7ee7fc18585790f4
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Richard Huang [Fri, 11 Aug 2017 11:44:17 +0000 (12:44 +0100)]
DALi Version 1.2.52
Change-Id: I0afcd18970dd8c5f244b064f083f83ef01e8f544
minho.sun [Thu, 27 Jul 2017 03:02:43 +0000 (12:02 +0900)]
Fixed focus manager crash Fixed focus manager crash.
When pre focused actor which is in history stack is removed, we cannot know about that
via base-object pointer.
So, contain WeakHandle of Actor instead of base-object pointer in std::vector.
Change-Id: Id523747099013319c72ae402ceea12fea9cf2ccb
Signed-off-by: minho.sun <minho.sun@samsung.com>
Adeel Kazmi [Wed, 9 Aug 2017 14:58:46 +0000 (14:58 +0000)]
Merge "Fix Slider MARKS GetProperty value" into devel/master
Adeel Kazmi [Wed, 9 Aug 2017 11:32:22 +0000 (11:32 +0000)]
Revert "Check character glyph index before using cached Font"
This reverts commit
efb94d8c348a12264e102ccf085ab5d707c85826.
Change-Id: I2168a955a612b47ab668032c4b3efc250f6ec762
Seoyeon Kim [Tue, 8 Aug 2017 06:20:09 +0000 (15:20 +0900)]
Fix Slider MARKS GetProperty value
- Fixed to return a PropertyArray of Slider MARKS property
Change-Id: Icc970a2a11a6ffed9de5f23adc053b422cfdb0cc
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
Adeel Kazmi [Fri, 4 Aug 2017 14:08:08 +0000 (14:08 +0000)]
Merge "Add U0 case to Utf8ToUtf32" into devel/master
David Steele [Fri, 4 Aug 2017 13:49:22 +0000 (13:49 +0000)]
Merge "ImageView ResourceReady logic update" into devel/master
David Steele [Fri, 4 Aug 2017 13:49:14 +0000 (13:49 +0000)]
Merge "Ensure ImageView updates mVisual once ready/loaded" into devel/master
Agnelo Vaz [Wed, 2 Aug 2017 17:00:53 +0000 (18:00 +0100)]
ImageView ResourceReady logic update
Change-Id: I9cedf4f0edead2fb492a9431187cf88d9012da64
greynaga [Fri, 4 Aug 2017 10:43:47 +0000 (11:43 +0100)]
DALi Version 1.2.51
Change-Id: I3d100ee1f792cddb46dbc0e8bb32d3a37a77b980
Heeyong Song [Thu, 3 Aug 2017 10:57:35 +0000 (19:57 +0900)]
Add U0 case to Utf8ToUtf32
Change-Id: I9507be62ec8239b39fdd94035233c2b88f4d47c3
Agnelo Vaz [Tue, 1 Aug 2017 13:35:38 +0000 (14:35 +0100)]
Ensure ImageView updates mVisual once ready/loaded
Previously mVisual was only updated after OnRelayout but this is too late,
RelayoutRequest triggers GetNaturalSize before OnRelayout, GetNaturalSize needs mVisual to be the updated visual not the previous.
Change-Id: Ib0e46af88774d866a5f6074e43437f0b173bf0f6
David Steele [Wed, 2 Aug 2017 13:11:52 +0000 (14:11 +0100)]
Updated ImageVisual::GetNaturalSize to work with loaded images
Change-Id: I33d5a66aec57460e318fced5b41deb16fe9beba5
David Steele [Mon, 31 Jul 2017 19:53:57 +0000 (20:53 +0100)]
Updated L8 text shader to account for actor alpha
Fading demos such as popup and contact view were showing text too early / too late.
This patch fixes these demos.
Change-Id: I54aa32311ca27f9169f7b196d45a111ef0965f95
Signed-off-by: David Steele <david.steele@samsung.com>
David Steele [Fri, 28 Jul 2017 16:02:07 +0000 (16:02 +0000)]
Merge "DALi Version 1.2.50" into devel/master
Adeel Kazmi [Fri, 28 Jul 2017 15:54:52 +0000 (16:54 +0100)]
DALi Version 1.2.50
Change-Id: I701a25e30d261182d83379efe5070b778db8d538
Agnelo Vaz [Fri, 14 Jul 2017 14:15:22 +0000 (15:15 +0100)]
TextColor Animatable
Change-Id: Id52feb84c3cf66037f9013f2832318b170543d76
Heeyong Song [Fri, 7 Jul 2017 08:21:11 +0000 (17:21 +0900)]
Change TestRenderSurface
Change-Id: Ifa120af136c265f0d19fc7e2235370de88bced35
Jinho, Lee [Thu, 27 Jul 2017 10:41:59 +0000 (10:41 +0000)]
Merge " Calculate a new height when text was changed." into devel/master
Jinho, Lee [Tue, 25 Jul 2017 04:41:48 +0000 (13:41 +0900)]
Calculate a new height when text was changed.
Even in the same font and size, sometimes they have different heights when inputting multiple langeages.
Change-Id: I83513ef4d190c71ab880f60b8ea2d788688ce0d9
Adeel Kazmi [Thu, 27 Jul 2017 08:56:30 +0000 (08:56 +0000)]
Merge "Note that some Text propeties in devel api can't be changed" into devel/master
minho.sun [Wed, 26 Jul 2017 07:42:51 +0000 (07:42 +0000)]
Merge "Ensure text-controller returns false when it doesn't use key." into devel/master
minho.sun [Wed, 26 Jul 2017 07:42:42 +0000 (07:42 +0000)]
Merge "Fixed resource package install error" into devel/master
minho.sun [Tue, 25 Jul 2017 13:23:24 +0000 (22:23 +0900)]
Ensure text-controller returns false when it doesn't use key.
Ensure text-controller returns false when it doesn't use key.
Plus, add tct cases for coverage.
Change-Id: I328af4c216e22cf7a3aff2d5ce2dea3780168f3a
Signed-off-by: minho.sun <minho.sun@samsung.com>
Adeel Kazmi [Tue, 25 Jul 2017 17:37:05 +0000 (17:37 +0000)]
Merge "Removing TextureUploadObserver from symbol table" into devel/master
Adeel Kazmi [Tue, 25 Jul 2017 17:02:50 +0000 (18:02 +0100)]
Removed redundant dali-sharp folder
Change-Id: Ieba47b96838587b04f9ea661476e4c7aa7ccdb4f
HyunJu Shin [Mon, 24 Jul 2017 02:51:07 +0000 (02:51 +0000)]
Merge "Line wrap mode property is added." into devel/master
minho.sun [Sat, 22 Jul 2017 05:00:50 +0000 (14:00 +0900)]
Fixed resource package install error
When updating resource package, always get mv error.
Fix them by removing all files in styles at pre-install.
Change-Id: Icb1e8fb928e1e43dceb37796d361d22521007113
Signed-off-by: minho.sun <minho.sun@samsung.com>
David Steele [Fri, 21 Jul 2017 14:34:13 +0000 (15:34 +0100)]
Removing TextureUploadObserver from symbol table
Change-Id: Ia16e22e972943baeedfd1e42903facc78c0f546d
Adeel Kazmi [Fri, 21 Jul 2017 13:27:45 +0000 (13:27 +0000)]
Merge "DALi Version 1.2.49" into devel/master
David Steele [Fri, 21 Jul 2017 13:24:36 +0000 (14:24 +0100)]
DALi Version 1.2.49
Change-Id: I58229a9bf8cf409142a532ebf1b57b01dfa32876
Adeel Kazmi [Fri, 21 Jul 2017 09:32:21 +0000 (09:32 +0000)]
Merge "Added Scaling and cropping properties to the image visual mask" into devel/master
Jinho, Lee [Wed, 19 Jul 2017 06:39:45 +0000 (15:39 +0900)]
Line wrap mode property is added.
When a text line is too long and needs to be moved to the next line, it decides whether to move text to next line word by word or character by character.
Change-Id: I502327ab7f7680570b7c3712c7e6f519c92d05a4
David Steele [Wed, 19 Jul 2017 18:52:51 +0000 (19:52 +0100)]
Added Scaling and cropping properties to the image visual mask
Have added 2 new properties to image visual to enable zooming into
an image before masking it.
Change-Id: I47259054f010497c0b92f1e46ff8bc15fc708ba4
Signed-off-by: David Steele <david.steele@samsung.com>
Seoyeon Kim [Thu, 20 Jul 2017 09:49:47 +0000 (18:49 +0900)]
Note that some Text propeties in devel api can't be changed
- Note that these properties are currently being used for some applications.
So, they can't be changed.
Change-Id: I41470f4563e52ea3e66c9ee9dbcd45cf3b57a26c
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
Seoyeon Kim [Wed, 19 Jul 2017 04:36:46 +0000 (13:36 +0900)]
Add PlaceholderTextFocused key in PLACEHOLDER property
- PLACEHOLDER property is MAP type.
Change-Id: I4694860c892c35ef112fab646b72258de538c563
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
Adeel Kazmi [Fri, 14 Jul 2017 14:41:51 +0000 (14:41 +0000)]
Merge "Adding support for multiple images in AnimatedImageVisual" into devel/master
David Steele [Fri, 14 Jul 2017 13:01:35 +0000 (13:01 +0000)]
Merge "DALi Version 1.2.48" into devel/master
adam.b [Fri, 14 Jul 2017 12:29:21 +0000 (13:29 +0100)]
DALi Version 1.2.48
Change-Id: Ie4641024a5ab47605dc74d7e6af29dd53cea3fa9
David Steele [Wed, 28 Jun 2017 12:40:23 +0000 (13:40 +0100)]
Adding support for multiple images in AnimatedImageVisual
As well as supporting animated GIF, the animated image visual also
supports animating between a number of images.
This can be done using a property map containing the following:
{
"url":[ "url1", "url2", "url3", "url4", "url5" ],
"batchSize" : 3,
"cacheSize" : 4,
"frameDelay" : 100
}
The cache size is the total number of images that will be loaded at any one time;
the batch size is the maximum number of images it will attempt to load before displaying.
If the cache size is smaller than the batch size, it is increased to match. If either
are larger than the number of urls, they are reduced to match.
As soon as the visual is created, it will start loading up to batchSize urls into the
cache. After each frame has completed, it will start loading the next batch, etc,
until the cache is full. After the next frame, it will load only the next URL into
the cache.
If at any time, the next image is not ready, it will wait for the loading to complete
before displaying and triggering the next batch/frame load, but will not reset the timer.
Change-Id: Iccd59768aec814ab3b73fb7b817e45b95299b2c2
Signed-off-by: David Steele <david.steele@samsung.com>
HyunJu Shin [Fri, 14 Jul 2017 07:56:59 +0000 (07:56 +0000)]
Merge "Calculate a new height when full relayout needed" into devel/master
Jinho, Lee [Thu, 13 Jul 2017 04:16:14 +0000 (04:16 +0000)]
Merge "Applyed text padding to TextLabel, Field, Editor" into devel/master
Jinho, Lee [Thu, 13 Jul 2017 03:03:21 +0000 (12:03 +0900)]
Calculate a new height when full relayout needed
Change-Id: Ifc7fc385e224abb5b85cc79e22b29b50ebb965f4
taeyoon0.lee [Wed, 12 Jul 2017 16:24:50 +0000 (16:24 +0000)]
Merge "Modified key event in TC" into devel/master
Agnelo Vaz [Mon, 3 Jul 2017 14:32:22 +0000 (15:32 +0100)]
Visual replacements logic updated
Setting conrol off stage ensures correct visuals shown when returned on stage
Ensure Control relayout is requested when a Visual becomes ready
Add flag to know if registered visual is pending ( can help relayouting )
Update of replacement logic
Change-Id: Id6cde8dc6a006d48155274c77210e3bb494e1765
Agnelo Vaz [Tue, 11 Jul 2017 14:04:59 +0000 (15:04 +0100)]
Control ResouceReady emits when all 'enabled' visuals ready
Change-Id: I2f85e317392f69c4dd504c19dd7756f30d4459b4
Jinho, Lee [Wed, 28 Jun 2017 13:10:54 +0000 (22:10 +0900)]
Applyed text padding to TextLabel, Field, Editor
Change-Id: Id736d9ce70626a624ed55d3644494d673159bf0a
Seoyeon Kim [Fri, 7 Jul 2017 06:25:58 +0000 (15:25 +0900)]
Fixed for single line text updates
- Fixed a SINGLE_LINE_BOX text update bug.
Change-Id: If1742cf19ffd75cda66ec705ae611ec8340ef48c
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
Adeel Kazmi [Fri, 7 Jul 2017 10:45:25 +0000 (10:45 +0000)]
Merge "DALi Version 1.2.47" into devel/master
Agnelo Vaz [Fri, 7 Jul 2017 10:20:35 +0000 (11:20 +0100)]
DALi Version 1.2.47
Change-Id: I0ee00c0c80470a7ee0ce4ccd7ec5ba44166a22ae
David Steele [Thu, 6 Jul 2017 16:53:40 +0000 (17:53 +0100)]
Updated test case CmakeLists.txt to work with newer version of CMAKE
Change-Id: I35e52281977d5c64f83e39c1acea5568fecf946e
taeyoon0.lee [Thu, 6 Jul 2017 06:58:23 +0000 (15:58 +0900)]
Modified key event in TC
- Changed DevelKeyEvent::... to DevelDevice::...
- Added subclass
Change-Id: I58e4fabee3afad39a0f7142a9ec2fe44340104e2
Victor Cebollada [Fri, 30 Jun 2017 15:13:27 +0000 (16:13 +0100)]
Fix for obj-loader
* Fixes an invalid read reported by valgrind.
* Fix an posible overflow
Change-Id: I57ccebb986d209b8d4deba4819b4b3cac8aced24
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Heeyong Song [Tue, 4 Jul 2017 01:36:05 +0000 (10:36 +0900)]
Fix a popup position error caused by SetInheritPosition() change
Change-Id: I26e9a223a214111a6ae3d7f30fc2d79342b4b189
taeyoon0.lee [Wed, 28 Jun 2017 15:29:40 +0000 (00:29 +0900)]
Supported position/size for underlay video rendering
- Set updated video display area by constraint
- Set video display area by blending of renderer
Change-Id: I3c230796a170cf99a1a0fc7df3e0d3af5010599b
taeyoon [Tue, 4 Jul 2017 03:14:49 +0000 (03:14 +0000)]
Merge "Modified video view impl by considering visual" into devel/master
Agnelo Vaz [Tue, 27 Jun 2017 18:40:15 +0000 (19:40 +0100)]
Replace registered visuals only when replacement is ready
Replacing an image before the replacement has loaded was causing a flicker
Control now only sets the visual of stage when the replacement is resource ready
Change-Id: I24d04102c2f945ba2659d4f35e2eaf257b71c11b
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
taeyoon [Fri, 9 Sep 2016 10:09:40 +0000 (19:09 +0900)]
Modified video view impl by considering visual
- modified rendering target and custom shader
Change-Id: I3f0d1082f4e210f23a2aec0524016bbc08b38ff5
Seoyeon Kim [Mon, 3 Jul 2017 00:47:04 +0000 (00:47 +0000)]
Merge "Implement Placeholder additional property" into devel/master
Adeel Kazmi [Fri, 30 Jun 2017 13:46:45 +0000 (13:46 +0000)]
Merge "Fix a crash when the same image is set repeatedly" into devel/master
Adeel Kazmi [Fri, 30 Jun 2017 10:43:25 +0000 (10:43 +0000)]
Merge "DALi Version 1.2.46" into devel/master
Adeel Kazmi [Fri, 30 Jun 2017 10:20:52 +0000 (11:20 +0100)]
DALi Version 1.2.46
Change-Id: I724f4103f6bbf589dab86bc0ddb34870d3976b0e
Seoyeon Kim [Fri, 9 Jun 2017 10:01:16 +0000 (19:01 +0900)]
Implement Placeholder additional property
- PLACEHOLDER property type is MAP :
Text, Color, Font Family, Font Style, Point Size, and Pixel Size
Change-Id: If6d8d941865ebb0e21aa70830c3ac1981907bafb
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
minho.sun [Fri, 30 Jun 2017 07:34:10 +0000 (07:34 +0000)]
Merge "Added config section to stylesheet" into devel/master
Heeyong Song [Thu, 29 Jun 2017 08:52:26 +0000 (17:52 +0900)]
Fix a crash when the same image is set repeatedly
Change-Id: I7a31401f8dc9b1fd1065d31be40e356839fbc6d4
Adeel Kazmi [Thu, 29 Jun 2017 10:10:00 +0000 (10:10 +0000)]
Merge "Add missing break statement in switch-case statements" into devel/master
minho.sun [Fri, 9 Jun 2017 05:01:25 +0000 (14:01 +0900)]
Added config section to stylesheet
Added config section to stylesheet.
User can set configuration for dali-toolkit via this section.
Currently, user can use only "alwaysShowFocus" which is for
KeyboardFocusManager.
( If true, shows focus indicator even if there is no KeyEvent. )
Change-Id: Iac2a6202c22a6026c63b3f42542c99341e73ad7b
Signed-off-by: minho.sun <minho.sun@samsung.com>
taeyoon0.lee [Thu, 29 Jun 2017 07:33:35 +0000 (16:33 +0900)]
Revert "Modified video view impl by considering visual"
One patch was merged by wrong way, so reverted
This reverts commit
79a69ab0b206ee0464a624077062e72f437bad98.
Change-Id: Ib3d55a0b23caf4040e5b3c3aa7640ea9e62a336e
taeyoon [Fri, 9 Sep 2016 10:09:40 +0000 (19:09 +0900)]
Modified video view impl by considering visual
Change-Id: I3f0d1082f4e210f23a2aec0524016bbc08b38ff5
Seoyeon Kim [Thu, 29 Jun 2017 01:47:32 +0000 (10:47 +0900)]
Add missing break statement in switch-case statements
- In image-visual.cpp, some break statement is missing.
Change-Id: I378677aa888806f63c97cb6f68e81df5e3e1d3f3
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
Adeel Kazmi [Wed, 28 Jun 2017 15:00:57 +0000 (15:00 +0000)]
Merge "Changed image loaders to use new PixelBuffer class." into devel/master
David Steele [Tue, 20 Jun 2017 09:06:58 +0000 (10:06 +0100)]
Changed image loaders to use new PixelBuffer class.
Migrating from PixelData to PixelBuffer internally. Public API
still offers PixelData where needed.
Through DevelAPI, it is now possible to retrieve a PixelBuffer from
AsyncImageLoader.
Removed BitmapLoader usage in favour of LoadImageFromFile().
Change-Id: Ib9e7b96cb6d643c0fb13e24b598131a3642a4b7c
Signed-off-by: David Steele <david.steele@samsung.com>
Seoyeon Kim [Wed, 28 Jun 2017 08:20:25 +0000 (08:20 +0000)]
Merge "Add ENABLE_SELECTION property to TextField and TextEditor" into devel/master
Seoyeon Kim [Fri, 16 Jun 2017 05:06:01 +0000 (14:06 +0900)]
Add ENABLE_SELECTION property to TextField and TextEditor
- ENABLE_SELECTION property is to enable or disable the text selection and clipboard.
Change-Id: Iff778b4dc414415b83d04aff8bccdc2d8f3a93a3
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
devrajsinghchouhan [Tue, 20 Jun 2017 10:30:14 +0000 (16:00 +0530)]
Added custom vertex shader support for NinePatch
Change-Id: I42e9f5bcecf5dcea0bd20d37de8cbd8ddd2f9b5b
Signed-off-by: devrajsinghchouhan <devraj.singh@samsung.com>
Enable Custom Vertex Shader Support for NinePatch Visual.
Paul Wisbey [Mon, 13 Feb 2017 11:02:31 +0000 (11:02 +0000)]
Removed unused variable from 9-patch shader
Change-Id: I26eee3590a4eecb1d61d79b941546317e7124803
Adeel Kazmi [Fri, 23 Jun 2017 09:50:57 +0000 (09:50 +0000)]
Merge "DALi Version 1.2.45" into devel/master
Adeel Kazmi [Fri, 23 Jun 2017 09:49:52 +0000 (09:49 +0000)]
Merge "Add Text font size conversion description in documentation" into devel/master
Victor Cebollada [Fri, 23 Jun 2017 09:43:59 +0000 (10:43 +0100)]
DALi Version 1.2.45
Change-Id: I06813e9cba6bd9e70a7f5a04b1e7d43bf8d5dc6e
minho.sun [Wed, 21 Jun 2017 05:06:09 +0000 (05:06 +0000)]
Merge "Make TextEditor emit ScrollStateChangedSignal after ScrollBar creation" into devel/master
Jinho, Lee [Wed, 21 Jun 2017 01:30:00 +0000 (01:30 +0000)]
Merge "Fixed an error adding duplicate primary position.y" into devel/master
Jinho, Lee [Fri, 9 Jun 2017 16:32:56 +0000 (01:32 +0900)]
Fixed an error adding duplicate primary position.y
In the target, characters with different glyph heights
(ex: Korean, English: "안녕하세요, hello") are written in same text field
when the character is deleted by one character,
the position of the TextField continuously goes down.
Change-Id: Ic44d79992eec67ae7ddec9e302c95877f90f2580
Adeel Kazmi [Mon, 19 Jun 2017 12:16:39 +0000 (12:16 +0000)]
Merge "Added GetTypeInfo to get registered type of a control wrapper" into devel/master
Adeel Kazmi [Mon, 19 Jun 2017 12:08:57 +0000 (12:08 +0000)]
Merge "Fixed automatic naming of visuals for non-native controls" into devel/master
David Steele [Thu, 15 Jun 2017 16:13:47 +0000 (17:13 +0100)]
Added GetTypeInfo to get registered type of a control wrapper
Added test case to show end-to-end registry setting and usage
(i.e. registering a property, registering a visual with that property
index, and using CreateTransition to check that the visual was correctly
named with the property name)
Change-Id: I216a2cbf0299557ac0eb91b5208b20a76f7dadeb
Adeel Kazmi [Fri, 16 Jun 2017 15:05:28 +0000 (15:05 +0000)]
Merge "Fixed texture-manager crash for async load complete" into devel/master
David Steele [Thu, 15 Jun 2017 10:51:06 +0000 (11:51 +0100)]
Fixed automatic naming of visuals for non-native controls
Ensured Control::Background visual is named to "background" regardless.
During visual registration, a lookup of registered properties is attempted to
retrieve the name of the property and assign that name to the visual.
(Used by scripting and styling).
In the case of non-native controls, where they use ControlWrapper as
their gateway class, the typeid lookup cannot get past ControlWrapper,
so will currently fail to name the visuals.
Instead, changed the RegisterVisual method to call GetPropertyName() directly -
for the ControlWrapper case, the non-native type name has been set on this object,
and in the glue layer, any C# properties annotated with ScriptableProperties
will be registered with the same type name. Consequently, GetPropertyName() will
work as intended for non-native properties.
However, this has to be within a try-catch block, as it will assert if the
developer hasn't registered the property index, which is the case
for some native controls.
Change-Id: I8b92496a21d13e3696fb827e67586f92e9e0dffb
Signed-off-by: David Steele <david.steele@samsung.com>
Adeel Kazmi [Fri, 16 Jun 2017 11:09:11 +0000 (11:09 +0000)]
Merge "DALi Version 1.2.44" into devel/master
Umar [Fri, 16 Jun 2017 11:03:43 +0000 (12:03 +0100)]
DALi Version 1.2.44
Change-Id: Ia567aeec4addef1d25095a9162d04b4063febe75