platform/core/uifw/dali-toolkit.git
6 years ago[Tizen] make same as LineWrap mode for TextLabel and TextEditor 39/143439/1 accepted/tizen/unified/20170810.172403 submit/tizen/20170810.040905
dongsug.song [Thu, 10 Aug 2017 02:29:57 +0000 (11:29 +0900)]
[Tizen] make same as LineWrap mode for TextLabel and TextEditor

Change-Id: I14fc2118aed5bf51d6a17de997f7eb492456fbcf
Signed-off-by: dongsug.song <dongsug.song@samsung.com>
6 years ago[Tizen] Updated L8 text shader to account for actor alpha 80/142580/1 accepted/tizen/unified/20170809.015316 submit/tizen/20170804.104325 submit/tizen/20170804.104701
David Steele [Mon, 31 Jul 2017 19:53:57 +0000 (20:53 +0100)]
[Tizen] 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>
6 years ago[Tizen] Updated ImageVisual::GetNaturalSize to work with loaded images 85/142385/1
David Steele [Wed, 2 Aug 2017 13:11:52 +0000 (14:11 +0100)]
[Tizen] Updated ImageVisual::GetNaturalSize to work with loaded images

Change-Id: I33d5a66aec57460e318fced5b41deb16fe9beba5

6 years ago[Tizen] Show focus indicator when using SetCurrentFocusActor 14/142114/1
minho.sun [Wed, 2 Aug 2017 13:32:25 +0000 (22:32 +0900)]
[Tizen] Show focus indicator when using SetCurrentFocusActor

In tv, alwaysShowFocus should be true.

Change-Id: Icecac829f4e9b15d6a4c36a09c60dac70d240822
Signed-off-by: minho.sun <minho.sun@samsung.com>
6 years ago[Tizen] Ensure ImageView updates mVisual once ready/loaded 34/141834/1
Agnelo Vaz [Tue, 1 Aug 2017 13:35:38 +0000 (14:35 +0100)]
[Tizen] 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: I0a39e36d76a21b7274d0fbe49c6b954382de887e

6 years ago[Tizen] Fix resource package install issue 81/141681/1
minho.sun [Tue, 1 Aug 2017 01:12:59 +0000 (10:12 +0900)]
[Tizen] Fix resource package install issue

This reverts commit 546283a3af0347e9fa4c26cda1c2b5c97726953e.

Change-Id: I5f8d73b49e07de8fb645a546f913bad9f8fb86fb

6 years ago[Tizen] Restore behavior of Uploaded and LoadingFinished signal 80/141680/1
minho.sun [Tue, 1 Aug 2017 01:10:02 +0000 (10:10 +0900)]
[Tizen] Restore behavior of Uploaded and LoadingFinished signal

This reverts commit 859ba2ee72f2d8fcd1a20891692b824eed6d2ebe.

Change-Id: I5397275ece2750ab1112bfdc88bf2d2a3ab1acbb

6 years agoMerge branch 'devel/master' into tizen 79/141679/1
minho.sun [Tue, 1 Aug 2017 01:09:27 +0000 (10:09 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: Ia57226a428e157e736be05fd313fb725d2f8fde1

6 years agoRevert "[Tizen] Restore behavior of Uploaded and LoadingFinished signal" 78/141678/1
minho.sun [Tue, 1 Aug 2017 01:08:55 +0000 (10:08 +0900)]
Revert "[Tizen] Restore behavior of Uploaded and LoadingFinished signal"

This reverts commit 692cde5837c59ec4e00c1b4ded3f521eb9940e87.

Change-Id: Ie4d93b0ddefa3c3f6a0ec8bcdab18dbb0034cd2e

6 years agoRevert "[Tizen] fix resource package update bug" 77/141677/1
minho.sun [Tue, 1 Aug 2017 01:08:41 +0000 (10:08 +0900)]
Revert "[Tizen] fix resource package update bug"

This reverts commit cd222cd0ba9ad51e9e187b86b67d12559c1f2c5b.

Change-Id: I0424adfaeb7743510174503b876696ea795b9f36

6 years agoRevert "[Tizen] Fix resource package install error" 76/141676/1
minho.sun [Tue, 1 Aug 2017 01:08:30 +0000 (10:08 +0900)]
Revert "[Tizen] Fix resource package install error"

This reverts commit be285c96c24c22f863e411c7bfd752123789bfb2.

Change-Id: Ib8d74aec2f9869400a4777bf6b506659e6ffd9bf

6 years agoRevert "[Tizen] Removed redundant dali-sharp folder" 75/141675/1
minho.sun [Tue, 1 Aug 2017 01:07:51 +0000 (10:07 +0900)]
Revert "[Tizen] Removed redundant dali-sharp folder"

This reverts commit e7e07f9f6f7e1adb0f61297a621a716c3dc50aaa.

Change-Id: I1e12adc1939cd0757186c1261a0980e0c9d3e4b8

6 years agoRevert "[Tizen] Fix resource package install issue" 74/141674/1
minho.sun [Tue, 1 Aug 2017 01:07:34 +0000 (10:07 +0900)]
Revert "[Tizen] Fix resource package install issue"

This reverts commit 480357dbda1845b090099851e20ed0b416b51df9.

Change-Id: Ie73c061678582bbd976e224fc342a6ab087b6986

6 years ago[Tizen] Fix resource package install issue 54/141354/2
minho.sun [Mon, 31 Jul 2017 06:22:39 +0000 (15:22 +0900)]
[Tizen] Fix resource package install issue

Fix resource package install issue.
It caused by post uninstall steps.

Change-Id: Ifec5dcf4941aa6e3748f3fd9f52eff32e4354a2b
Signed-off-by: minho.sun <minho.sun@samsung.com>
6 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

6 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

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

Change-Id: Id52feb84c3cf66037f9013f2832318b170543d76

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

Change-Id: Ifa120af136c265f0d19fc7e2235370de88bced35

6 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

6 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

6 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

6 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

6 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

6 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>
6 years ago[Tizen] Removed redundant dali-sharp folder 08/140708/1 accepted/tizen/4.0/unified/20170816.012627 accepted/tizen/4.0/unified/20170816.015415 accepted/tizen/unified/20170727.191512 submit/tizen/20170726.063443 submit/tizen/20170727.071110 submit/tizen_4.0/20170811.094300 submit/tizen_4.0/20170814.115522 submit/tizen_4.0_unified/20170814.115522
Adeel Kazmi [Tue, 25 Jul 2017 17:02:50 +0000 (18:02 +0100)]
[Tizen] Removed redundant dali-sharp folder

Change-Id: Ieba47b96838587b04f9ea661476e4c7aa7ccdb4f

6 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

6 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

6 years ago[Tizen] Fix resource package install error 51/140151/1 submit/tizen/20170725.060315 submit/tizen/20170725.110106
taeyoon0.lee [Mon, 24 Jul 2017 04:46:24 +0000 (13:46 +0900)]
[Tizen] Fix resource package install error

This reverts commit 2e807540a6224c4e3461cfd3cb82981c6d092d70.

Change-Id: I11d877eb620736b69ac55d02ba822a8d4bd8af8f

6 years ago[Tizen] fix resource package update bug 50/140150/1
taeyoon0.lee [Mon, 24 Jul 2017 04:45:43 +0000 (13:45 +0900)]
[Tizen] fix resource package update bug

This reverts commit fcf93fa90562dd75deb58643d01196d5298fa776.

Change-Id: Ie3db19592d79ca4b78853f392bf4261def5a3205

6 years ago[Tizen] Restore behavior of Uploaded and LoadingFinished signal 49/140149/1
taeyoon0.lee [Mon, 24 Jul 2017 04:45:03 +0000 (13:45 +0900)]
[Tizen] Restore behavior of Uploaded and LoadingFinished signal

This reverts commit be158213cf3791451871c3a08d7b13894279662d.

Change-Id: Ib260d45cf4f692f15b178d1b4e92a4670c8df16c

6 years agoMerge branch 'devel/master (1.2.49)' into tizen 48/140148/1
taeyoon0.lee [Mon, 24 Jul 2017 03:43:52 +0000 (12:43 +0900)]
Merge branch 'devel/master (1.2.49)' into tizen

Change-Id: I808b333f7fa76a20b275603d5a1e52b2d993abd4

6 years agoRevert "[Tizen] Restore behavior of Uploaded and LoadingFinished signal" 47/140147/1
taeyoon0.lee [Mon, 24 Jul 2017 03:43:01 +0000 (12:43 +0900)]
Revert "[Tizen] Restore behavior of Uploaded and LoadingFinished signal"

This reverts commit 42ce680924ef4123c56654433729dc90379bbf34.

Change-Id: Ib383ef86a483f21cbb3d648f03e150f92541a16c

6 years agoRevert "[Tizen] Revert "Replace registered visuals only when replacement is ready"" 46/140146/1
taeyoon0.lee [Mon, 24 Jul 2017 03:42:28 +0000 (12:42 +0900)]
Revert "[Tizen] Revert "Replace registered visuals only when replacement is ready""

This reverts commit 59c28ffe7ae770ba86b1840760902fce5210cc92.

Change-Id: I47f19c91589c53bc9aa9fb15928dc213f2d7e2f3

6 years agoRevert "[Tizen] fix resource package update bug" 45/140145/1
taeyoon0.lee [Mon, 24 Jul 2017 03:41:38 +0000 (12:41 +0900)]
Revert "[Tizen] fix resource package update bug"

This reverts commit edcfb92968bbf87c003dfcf3e7057cdfb43155d3.

Change-Id: I464f50d0da8568a99a70438da6dcf23b9da1360a

6 years agoRevert "[Tizen] Fix resource package install error" 44/140144/1
taeyoon0.lee [Mon, 24 Jul 2017 03:39:40 +0000 (12:39 +0900)]
Revert "[Tizen] Fix resource package install error"

This reverts commit 2a00e4d5a243bc812841610b875ed3cb76fe7e53.

Change-Id: Ic813da4b9dd58e28d7135e2fae71df90c49a9d2c

6 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

6 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>
6 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

6 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

6 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

6 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

6 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

6 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>
6 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>
6 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>
6 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

6 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

6 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

6 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>
6 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

6 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

6 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

6 years ago[Tizen] Fix resource package install error 75/138575/1 accepted/tizen/unified/20170713.153455 submit/tizen/20170713.012831
minho.sun [Thu, 13 Jul 2017 01:18:34 +0000 (10:18 +0900)]
[Tizen] Fix resource package install error

Fix resource package install error.

Change-Id: I14016bc0f0e9cef41452a94c31530de12295ec49
Signed-off-by: minho.sun <minho.sun@samsung.com>
6 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

6 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

6 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

6 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

6 years ago[Tizen] fix resource package update bug 85/138185/1 submit/tizen/20170712.153510
minho.sun [Tue, 11 Jul 2017 10:48:25 +0000 (19:48 +0900)]
[Tizen] fix resource package update bug

when updating resource package, always get mv error.

Fix them by removing all files in styles at pre-install.

Change-Id: I72c881f67daa6c080571e101610339bcce15e6dc
Signed-off-by: minho.sun <minho.sun@samsung.com>
6 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>
6 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

6 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

6 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

6 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

6 years ago[Tizen] Revert "Replace registered visuals only when replacement is ready" 70/137470/1 accepted/tizen/unified/20170706.193938 submit/tizen/20170706.054645
Heeyong Song [Thu, 6 Jul 2017 04:49:50 +0000 (13:49 +0900)]
[Tizen] Revert "Replace registered visuals only when replacement is ready"

This reverts commit fb390b3f5e576e2fc11b3755f4dc9c3ff2150d90.

Conflicts:
dali-toolkit/internal/controls/image-view/image-view-impl.h

Change-Id: I98b84df5b4d49f04f3c2671efdee3a3a3f114c13

6 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>
6 years ago[Tizen] Restore behavior of Uploaded and LoadingFinished signal 69/137169/1 submit/tizen/20170705.113121
Jinho, Lee [Tue, 4 Jul 2017 06:48:31 +0000 (15:48 +0900)]
[Tizen] Restore behavior of Uploaded and LoadingFinished signal

This reverts commit 155449f47de8b6e0a4c4edae2cab7ae16d5fd274.

Change-Id: I09703c4baf63ee560c34a2d9a7af3b6bef02041d

6 years agoMerge branch 'devel/master' into tizen 68/137168/1
Jinho, Lee [Tue, 4 Jul 2017 06:00:41 +0000 (15:00 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: I9d7bb28dab694ad14484e248ca9fb1cce69cdb03

6 years agoRevert "[Tizen] Restore behavior of Uploaded and LoadingFinished signal" 67/137167/1
Jinho, Lee [Tue, 4 Jul 2017 05:54:47 +0000 (14:54 +0900)]
Revert "[Tizen] Restore behavior of Uploaded and LoadingFinished signal"

This reverts commit d2bce9840862469d6ddfdaec4c94b46eaee14772.

Change-Id: Ic0808e8c920f25df6ecce153336ade390982b4f8

6 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

6 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

6 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

6 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>
6 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

6 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

6 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

6 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

6 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

6 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>
6 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

6 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

6 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

6 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>
6 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

6 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

6 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>
6 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

6 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>
6 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

6 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>
6 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.

6 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

6 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

6 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

6 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

6 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

6 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

6 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

6 years ago[Tizen] Restore behavior of Uploaded and LoadingFinished signal 86/134886/1 accepted/tizen/unified/20170630.083235 submit/tizen/20170621.112620 submit/tizen/20170622.035441
Heeyong Song [Tue, 20 Jun 2017 07:52:06 +0000 (16:52 +0900)]
[Tizen] Restore behavior of Uploaded and LoadingFinished signal

Change-Id: I05c0c9b8df91d8310bcc9e55007141e1f654aae4

6 years agoMerge branch 'devel/master' into tizen 85/134885/1
Heeyong Song [Tue, 20 Jun 2017 07:51:13 +0000 (16:51 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: I61c6723291e2e9af475e6ed454b1125936f7eebc

6 years agoRevert "[Tizen] Fix SVACE issue - change sscanf(%d) to strtol" 84/134884/1
Heeyong Song [Tue, 20 Jun 2017 07:50:57 +0000 (16:50 +0900)]
Revert "[Tizen] Fix SVACE issue - change sscanf(%d) to strtol"

This reverts commit eb4bb5f26b2e03eb7a66bbccedb93c78e92a5b03.

Change-Id: I1ec196378764e1728d34793aa25322a5051b1035