platform/core/uifw/dali-toolkit.git
7 years agoMerge "Add U0 case to Utf8ToUtf32" into devel/master
Adeel Kazmi [Fri, 4 Aug 2017 14:08:08 +0000 (14:08 +0000)]
Merge "Add U0 case to Utf8ToUtf32" into devel/master

7 years agoMerge "ImageView ResourceReady logic update" into devel/master
David Steele [Fri, 4 Aug 2017 13:49:22 +0000 (13:49 +0000)]
Merge "ImageView ResourceReady logic update" into devel/master

7 years agoMerge "Ensure ImageView updates mVisual once ready/loaded" 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

7 years agoImageView ResourceReady logic update 26/142126/3
Agnelo Vaz [Wed, 2 Aug 2017 17:00:53 +0000 (18:00 +0100)]
ImageView ResourceReady logic update

Change-Id: I9cedf4f0edead2fb492a9431187cf88d9012da64

7 years agoDALi Version 1.2.51 88/142588/1 dali_1.2.51
greynaga [Fri, 4 Aug 2017 10:43:47 +0000 (11:43 +0100)]
DALi Version 1.2.51

Change-Id: I3d100ee1f792cddb46dbc0e8bb32d3a37a77b980

7 years agoAdd U0 case to Utf8ToUtf32 16/142316/3
Heeyong Song [Thu, 3 Aug 2017 10:57:35 +0000 (19:57 +0900)]
Add U0 case to Utf8ToUtf32

Change-Id: I9507be62ec8239b39fdd94035233c2b88f4d47c3

7 years agoEnsure ImageView updates mVisual once ready/loaded 28/141828/4
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

7 years agoUpdated ImageVisual::GetNaturalSize to work with loaded images 11/142111/4
David Steele [Wed, 2 Aug 2017 13:11:52 +0000 (14:11 +0100)]
Updated ImageVisual::GetNaturalSize to work with loaded images

Change-Id: I33d5a66aec57460e318fced5b41deb16fe9beba5

7 years agoUpdated L8 text shader to account for actor alpha 76/141476/1
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>
7 years agoMerge "DALi Version 1.2.50" into devel/master
David Steele [Fri, 28 Jul 2017 16:02:07 +0000 (16:02 +0000)]
Merge "DALi Version 1.2.50" into devel/master

7 years agoDALi Version 1.2.50 28/141228/1 dali_1.2.50
Adeel Kazmi [Fri, 28 Jul 2017 15:54:52 +0000 (16:54 +0100)]
DALi Version 1.2.50

Change-Id: I701a25e30d261182d83379efe5070b778db8d538

7 years agoTextColor Animatable 00/139000/7
Agnelo Vaz [Fri, 14 Jul 2017 14:15:22 +0000 (15:15 +0100)]
TextColor Animatable

Change-Id: Id52feb84c3cf66037f9013f2832318b170543d76

7 years agoChange TestRenderSurface 28/137728/3
Heeyong Song [Fri, 7 Jul 2017 08:21:11 +0000 (17:21 +0900)]
Change TestRenderSurface

Change-Id: Ifa120af136c265f0d19fc7e2235370de88bced35

7 years agoMerge " Calculate a new height when text was changed." into devel/master
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

7 years ago Calculate a new height when text was changed. 48/140448/3
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

7 years agoMerge "Note that some Text propeties in devel api can't be changed" into devel/master
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

7 years agoMerge "Ensure text-controller returns false when it doesn't use key." into devel...
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

7 years agoMerge "Fixed resource package install error" 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

7 years agoEnsure text-controller returns false when it doesn't use key. 97/140597/2
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>
7 years agoMerge "Removing TextureUploadObserver from symbol table" into devel/master
Adeel Kazmi [Tue, 25 Jul 2017 17:37:05 +0000 (17:37 +0000)]
Merge "Removing TextureUploadObserver from symbol table" into devel/master

7 years agoRemoved redundant dali-sharp folder 20/140620/1
Adeel Kazmi [Tue, 25 Jul 2017 17:02:50 +0000 (18:02 +0100)]
Removed redundant dali-sharp folder

Change-Id: Ieba47b96838587b04f9ea661476e4c7aa7ccdb4f

7 years agoMerge "Line wrap mode property is added." into devel/master
HyunJu Shin [Mon, 24 Jul 2017 02:51:07 +0000 (02:51 +0000)]
Merge "Line wrap mode property is added." into devel/master

7 years agoFixed resource package install error 79/140079/2
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>
7 years agoRemoving TextureUploadObserver from symbol table 64/140064/1
David Steele [Fri, 21 Jul 2017 14:34:13 +0000 (15:34 +0100)]
Removing TextureUploadObserver from symbol table

Change-Id: Ia16e22e972943baeedfd1e42903facc78c0f546d

7 years agoMerge "DALi Version 1.2.49" into devel/master
Adeel Kazmi [Fri, 21 Jul 2017 13:27:45 +0000 (13:27 +0000)]
Merge "DALi Version 1.2.49" into devel/master

7 years agoDALi Version 1.2.49 51/140051/1 dali_1.2.49
David Steele [Fri, 21 Jul 2017 13:24:36 +0000 (14:24 +0100)]
DALi Version 1.2.49

Change-Id: I58229a9bf8cf409142a532ebf1b57b01dfa32876

7 years agoMerge "Added Scaling and cropping properties to the image visual mask" into devel...
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

7 years agoLine wrap mode property is added. 71/139571/5
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

7 years agoAdded Scaling and cropping properties to the image visual mask 30/139630/4
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>
7 years agoNote that some Text propeties in devel api can't be changed 75/139775/2
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>
7 years agoAdd PlaceholderTextFocused key in PLACEHOLDER property 57/139457/2
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>
7 years agoMerge "Adding support for multiple images in AnimatedImageVisual" into devel/master
Adeel Kazmi [Fri, 14 Jul 2017 14:41:51 +0000 (14:41 +0000)]
Merge "Adding support for multiple images in AnimatedImageVisual" into devel/master

7 years agoMerge "DALi Version 1.2.48" 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

7 years agoDALi Version 1.2.48 79/138979/1 dali_1.2.48
adam.b [Fri, 14 Jul 2017 12:29:21 +0000 (13:29 +0100)]
DALi Version 1.2.48

Change-Id: Ie4641024a5ab47605dc74d7e6af29dd53cea3fa9

7 years agoAdding support for multiple images in AnimatedImageVisual 72/136672/9
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>
7 years agoMerge "Calculate a new height when full relayout needed" into devel/master
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

7 years agoMerge "Applyed text padding to TextLabel, Field, Editor" 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

7 years agoCalculate a new height when full relayout needed 14/138614/1
Jinho, Lee [Thu, 13 Jul 2017 03:03:21 +0000 (12:03 +0900)]
Calculate a new height when full relayout needed

Change-Id: Ifc7fc385e224abb5b85cc79e22b29b50ebb965f4

7 years agoMerge "Modified key event in TC" into devel/master
taeyoon0.lee [Wed, 12 Jul 2017 16:24:50 +0000 (16:24 +0000)]
Merge "Modified key event in TC" into devel/master

7 years agoVisual replacements logic updated 42/137142/9
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

7 years agoControl ResouceReady emits when all 'enabled' visuals ready 16/138216/2
Agnelo Vaz [Tue, 11 Jul 2017 14:04:59 +0000 (15:04 +0100)]
Control ResouceReady emits when all 'enabled' visuals ready

Change-Id: I2f85e317392f69c4dd504c19dd7756f30d4459b4

7 years agoApplyed text padding to TextLabel, Field, Editor 73/137173/8
Jinho, Lee [Wed, 28 Jun 2017 13:10:54 +0000 (22:10 +0900)]
Applyed text padding to TextLabel, Field, Editor

Change-Id: Id736d9ce70626a624ed55d3644494d673159bf0a

7 years agoFixed for single line text updates 99/137699/3
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>
7 years agoMerge "DALi Version 1.2.47" into devel/master
Adeel Kazmi [Fri, 7 Jul 2017 10:45:25 +0000 (10:45 +0000)]
Merge "DALi Version 1.2.47" into devel/master

7 years agoDALi Version 1.2.47 49/137749/1 dali_1.2.47
Agnelo Vaz [Fri, 7 Jul 2017 10:20:35 +0000 (11:20 +0100)]
DALi Version 1.2.47

Change-Id: I0ee00c0c80470a7ee0ce4ccd7ec5ba44166a22ae

7 years agoUpdated test case CmakeLists.txt to work with newer version of CMAKE 04/137604/1
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

7 years agoModified key event in TC 95/137495/4
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

7 years agoFix for obj-loader 65/136665/7
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>
7 years agoFix a popup position error caused by SetInheritPosition() change 53/136953/2
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

7 years agoSupported position/size for underlay video rendering 88/136388/15
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

7 years agoMerge "Modified video view impl by considering visual" into devel/master
taeyoon [Tue, 4 Jul 2017 03:14:49 +0000 (03:14 +0000)]
Merge "Modified video view impl by considering visual" into devel/master

7 years agoReplace registered visuals only when replacement is ready 76/135976/11
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>
7 years agoModified video view impl by considering visual 52/136352/7
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

7 years agoMerge "Implement Placeholder additional property" into devel/master
Seoyeon Kim [Mon, 3 Jul 2017 00:47:04 +0000 (00:47 +0000)]
Merge "Implement Placeholder additional property" into devel/master

7 years agoMerge "Fix a crash when the same image is set repeatedly" 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

7 years agoMerge "DALi Version 1.2.46" 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

7 years agoDALi Version 1.2.46 11/136611/1 dali_1.2.46
Adeel Kazmi [Fri, 30 Jun 2017 10:20:52 +0000 (11:20 +0100)]
DALi Version 1.2.46

Change-Id: I724f4103f6bbf589dab86bc0ddb34870d3976b0e

7 years agoImplement Placeholder additional property 48/133248/20
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>
7 years agoMerge "Added config section to stylesheet" into devel/master
minho.sun [Fri, 30 Jun 2017 07:34:10 +0000 (07:34 +0000)]
Merge "Added config section to stylesheet" into devel/master

7 years agoFix a crash when the same image is set repeatedly 90/136390/2
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

7 years agoMerge "Add missing break statement in switch-case statements" into devel/master
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

7 years agoAdded config section to stylesheet 39/133139/8
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>
7 years agoRevert "Modified video view impl by considering visual" 51/136351/2
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

7 years agoModified video view impl by considering visual
taeyoon [Fri, 9 Sep 2016 10:09:40 +0000 (19:09 +0900)]
Modified video view impl by considering visual

Change-Id: I3f0d1082f4e210f23a2aec0524016bbc08b38ff5

7 years agoAdd missing break statement in switch-case statements 64/136264/1
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>
7 years agoMerge "Changed image loaders to use new PixelBuffer class." into devel/master
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

7 years agoChanged image loaders to use new PixelBuffer class. 27/134927/9
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>
7 years agoMerge "Add ENABLE_SELECTION property to TextField and TextEditor" into devel/master
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

7 years agoAdd ENABLE_SELECTION property to TextField and TextEditor 37/134337/8
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>
7 years agoAdded custom vertex shader support for NinePatch 61/134961/5
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.

7 years agoRemoved unused variable from 9-patch shader 68/114468/4
Paul Wisbey [Mon, 13 Feb 2017 11:02:31 +0000 (11:02 +0000)]
Removed unused variable from 9-patch shader

Change-Id: I26eee3590a4eecb1d61d79b941546317e7124803

7 years agoMerge "DALi Version 1.2.45" into devel/master
Adeel Kazmi [Fri, 23 Jun 2017 09:50:57 +0000 (09:50 +0000)]
Merge "DALi Version 1.2.45" into devel/master

7 years agoMerge "Add Text font size conversion description in documentation" 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

7 years agoDALi Version 1.2.45 08/135608/1 dali_1.2.45
Victor Cebollada [Fri, 23 Jun 2017 09:43:59 +0000 (10:43 +0100)]
DALi Version 1.2.45

Change-Id: I06813e9cba6bd9e70a7f5a04b1e7d43bf8d5dc6e

7 years agoMerge "Make TextEditor emit ScrollStateChangedSignal after ScrollBar creation" into...
minho.sun [Wed, 21 Jun 2017 05:06:09 +0000 (05:06 +0000)]
Merge "Make TextEditor emit ScrollStateChangedSignal after ScrollBar creation" into devel/master

7 years agoMerge "Fixed an error adding duplicate primary position.y" 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

7 years agoFixed an error adding duplicate primary position.y 19/133319/9
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

7 years agoMerge "Added GetTypeInfo to get registered type of a control wrapper" into devel...
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

7 years agoMerge "Fixed automatic naming of visuals for non-native controls" 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

7 years agoAdded GetTypeInfo to get registered type of a control wrapper 62/134462/2
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

7 years agoMerge "Fixed texture-manager crash for async load complete" into devel/master
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

7 years agoFixed automatic naming of visuals for non-native controls 78/134278/2
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>
7 years agoMerge "DALi Version 1.2.44" into devel/master
Adeel Kazmi [Fri, 16 Jun 2017 11:09:11 +0000 (11:09 +0000)]
Merge "DALi Version 1.2.44" into devel/master

7 years agoDALi Version 1.2.44 32/134432/1 dali_1.2.44
Umar [Fri, 16 Jun 2017 11:03:43 +0000 (12:03 +0100)]
DALi Version 1.2.44

Change-Id: Ia567aeec4addef1d25095a9162d04b4063febe75

7 years agoFixed texture-manager crash for async load complete 21/133521/3
Nick Holland [Thu, 15 Jun 2017 16:26:21 +0000 (17:26 +0100)]
Fixed texture-manager crash for async load complete

Crash was found when testing with this patch:
https://review.tizen.org/gerrit/#/c/132804/

    Test patch adds ImageViews to the stage, during a ResourceReady()
    call back, which has come from an AsyncLoad complete from
    ImageViews already on the stage.

Change-Id: I5073804a3cc391c9984db62c54224442923c3afa

7 years agoMerge "Check character glyph index before using cached Font" into devel/master
Jinho, Lee [Fri, 16 Jun 2017 07:52:33 +0000 (07:52 +0000)]
Merge "Check character glyph index before using cached Font" into devel/master

7 years agoMake TextEditor emit ScrollStateChangedSignal after ScrollBar creation 69/134369/1
minho.sun [Fri, 16 Jun 2017 06:49:12 +0000 (15:49 +0900)]
Make TextEditor emit ScrollStateChangedSignal after ScrollBar creation

Make TextEditor emit ScrollStateChangedSignal after ScrollBar creation.

Change-Id: I94d495873c54fbe25b421da4622013ffc91a6c3c
Signed-off-by: minho.sun <minho.sun@samsung.com>
7 years agoAdd Text font size conversion description in documentation 71/134171/1
Seoyeon Kim [Thu, 15 Jun 2017 06:16:01 +0000 (15:16 +0900)]
Add Text font size conversion description in documentation

Change-Id: I5f48be95e95997947a39686e0b76bfa646e8eebb
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
7 years agoTurns pixel align off as default 63/134163/2
taeyoon0.lee [Thu, 15 Jun 2017 05:41:03 +0000 (14:41 +0900)]
Turns pixel align off as default

 - Now it causes issues in imageView and animation

Change-Id: Ib400864c443727c8186475cf6cfb9160b026c17e

7 years agoMerge "Fixups following changes to actor traversal" into devel/master
David Steele [Mon, 12 Jun 2017 15:31:11 +0000 (15:31 +0000)]
Merge "Fixups following changes to actor traversal" into devel/master

7 years agoFixups following changes to actor traversal 54/132954/5
David Steele [Thu, 8 Jun 2017 11:15:20 +0000 (12:15 +0100)]
Fixups following changes to actor traversal

Fixed popup (background actor was after content)
Fixed text editor/field (highlight was on top of text)

Change-Id: I6597989b0f9fc15f4d3a1929bac8c41fba303ffa

7 years agoTextureManager "if" clause error 18/133318/2
Agnelo Vaz [Fri, 9 Jun 2017 17:26:11 +0000 (18:26 +0100)]
TextureManager "if" clause error

Change-Id: Idba7a1601273a8689dbfd1db3c6fb827dd3e3d7e

7 years agoMerge "Updated ImageVisual to handle CPU Image Masking" into devel/master
Adeel Kazmi [Fri, 9 Jun 2017 12:53:58 +0000 (12:53 +0000)]
Merge "Updated ImageVisual to handle CPU Image Masking" into devel/master

7 years agoDALi Version 1.2.43 86/133286/1 dali_1.2.43
Richard Huang [Fri, 9 Jun 2017 12:23:23 +0000 (13:23 +0100)]
DALi Version 1.2.43

Change-Id: I776e419011db8b06db04c4cddb6d48279cc80522

7 years agoMerge "Added ScrollStateChangedSignal to TextEditor." into devel/master
Adeel Kazmi [Thu, 8 Jun 2017 14:05:04 +0000 (14:05 +0000)]
Merge "Added ScrollStateChangedSignal to TextEditor." into devel/master

7 years agoAdded ScrollStateChangedSignal to TextEditor. 92/132092/10
minho.sun [Thu, 1 Jun 2017 05:22:22 +0000 (14:22 +0900)]
Added ScrollStateChangedSignal to TextEditor.

Added ScrollStateChagnedSignal to TextEditor.

State : STARTED / FINISHED

When UpdateScrollBar() called, STARTED.
When ScrollBar indicator animation is stopped, FINISHED.

Change-Id: I66409fee2432958aa17b49c4f8025f93a010403f
Signed-off-by: minho.sun <minho.sun@samsung.com>
7 years agoCheck character glyph index before using cached Font 28/132928/1
Jinho, Lee [Thu, 8 Jun 2017 07:20:51 +0000 (16:20 +0900)]
Check character glyph index before using cached Font

CJK script use 3 fonts (chiniese. japanese, korean),
  (tizen TV has, BreezeSansChinese-Regular.ttf, BreezeSansJapanese-Regular.ttf, BreezeSansKorean-Regular.ttf)

Some CJK characters may not be included in these three fonts.
In this case, it need to search fallback font again.

Change-Id: I99ed74af3d53edd82e029331c51a8404238f7745

7 years agoFixed getting SCROLL_POSITION_INTERVALS Property bug in ScrollBar 86/132886/2
minho.sun [Thu, 8 Jun 2017 07:06:54 +0000 (16:06 +0900)]
Fixed getting SCROLL_POSITION_INTERVALS Property bug in ScrollBar

Fixed getting SCROLL_POSITION_INTERVALS Property bug in ScrollBar.

When getting SCROLL_POSITION_INTERVALS property via GetProperty, it
always return 0.

Make the result of GetProperty be same as GetScrollPositionInterval().

Change-Id: Ide7353ebfb82e80959f7a0834f98d4c05ccd201f
Signed-off-by: minho.sun <minho.sun@samsung.com>
7 years agoUpdated ImageVisual to handle CPU Image Masking 64/130964/8
David Steele [Mon, 27 Mar 2017 13:24:36 +0000 (14:24 +0100)]
Updated ImageVisual to handle CPU Image Masking

Updated ImageVisual to add a URL for an alpha mask image. If this is present
in the initialization map, then the mask is loaded and stored in CPU (it
may be used by other textures). On triggering the Async image loading in
TextureManager, the alpha mask's textureId can be passed in.

Added new state machine to TextureManager to handle loading a mask and
and an image; and to apply the mask to the image when both have loaded.

Image masks are applied in CPU side, so they are stored in CPU memory.
All other images are uploaded to GPU ( after optional mask has been applied )

Change-Id: I6cce7f62d6d6765dc6199bb25891791333533dea

7 years agoMerge "Remove profile build dependencies" into devel/master
Adeel Kazmi [Wed, 7 Jun 2017 10:03:33 +0000 (10:03 +0000)]
Merge "Remove profile build dependencies" into devel/master