platform/core/uifw/dali-toolkit.git
7 years agoRevert "[Tizen] Restore behavior of Uploaded and LoadingFinished signal" 83/134883/1
Heeyong Song [Tue, 20 Jun 2017 07:50:33 +0000 (16:50 +0900)]
Revert "[Tizen] Restore behavior of Uploaded and LoadingFinished signal"

This reverts commit e72c514f927e67214497efcbbf545b4017f92f8c.

Change-Id: Ia5c851faf28b45fbf7756aa063f3ec1016ae0618

7 years ago[Tizen] Restore behavior of Uploaded and LoadingFinished signal 06/133606/1 accepted/tizen/unified/20170614.141237 submit/tizen/20170613.061944 submit/tizen/20170614.120205
Seoyeon Kim [Tue, 13 Jun 2017 02:11:34 +0000 (11:11 +0900)]
[Tizen] Restore behavior of Uploaded and LoadingFinished signal

This reverts commit 861ac65311644a35ee774d387ecfddbd314c201b.

Change-Id: I3e1a46a6dfe468a49a294c037e7e2fcf66409ad4

7 years ago[Tizen] Fix SVACE issue - change sscanf(%d) to strtol 05/133605/1
Seoyeon Kim [Tue, 13 Jun 2017 02:11:08 +0000 (11:11 +0900)]
[Tizen] Fix SVACE issue - change sscanf(%d) to strtol

This reverts commit 96a6656a0330918e7dc06cfb2756bf1373f64509.

Change-Id: Ic5503046d6adec8ac128b89a0766e05b00569fd7

7 years agoMerge branch 'devel/master' into tizen 04/133604/1
Seoyeon Kim [Tue, 13 Jun 2017 02:09:08 +0000 (11:09 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: I870581e0065ea9a692599dd899fa90dc48854a89

7 years agoRevert "[Tizen] Make all profile have mobile dali_toolkit_profile except tv" 03/133603/1
Seoyeon Kim [Tue, 13 Jun 2017 02:07:38 +0000 (11:07 +0900)]
Revert "[Tizen] Make all profile have mobile dali_toolkit_profile except tv"

This reverts commit 2ceace9727e8e21275ca91d392a932f5fbe4bafe.

Change-Id: Ic98a9b2acc16d343411ccf80a2c42fa9786663c7

7 years agoRevert "[Tizen] Remove profile build dependencies" 02/133602/1
Seoyeon Kim [Tue, 13 Jun 2017 02:07:20 +0000 (11:07 +0900)]
Revert "[Tizen] Remove profile build dependencies"

This reverts commit b6288ac0cc4ec207d47c78882b1f503f553e09a0.

Change-Id: I6d571bd182b48f61b6fbab63e6c69191ca5967b2

7 years agoRevert "[Tizen] Fix SVACE issue - change sscanf(%d) to strtol" 01/133601/1
Seoyeon Kim [Tue, 13 Jun 2017 02:06:50 +0000 (11:06 +0900)]
Revert "[Tizen] Fix SVACE issue - change sscanf(%d) to strtol"

This reverts commit 9890eb95dff1675153e3b7818f2623d9f2702fc7.

Change-Id: Iceb70822399f404a4d291fa5e61d28c08f14ed1e

7 years agoRevert "[Tizen] Restore behavior of Uploaded and LoadingFinished signal" 00/133600/1
Seoyeon Kim [Tue, 13 Jun 2017 02:06:33 +0000 (11:06 +0900)]
Revert "[Tizen] Restore behavior of Uploaded and LoadingFinished signal"

This reverts commit 6c45feefec8cf952dd667016352f312396ff366b.

Change-Id: Iaf1cd4fc4906fed4674718d28f08e77df7fa4ae8

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

7 years ago[Tizen] Restore behavior of Uploaded and LoadingFinished signal 60/132660/1 accepted/tizen/unified/20170608.072242 submit/tizen/20170607.061735
minho.sun [Wed, 7 Jun 2017 05:56:48 +0000 (14:56 +0900)]
[Tizen] Restore behavior of Uploaded and LoadingFinished signal

This reverts commit 9f6fa68b4e96e4a4e90d36a9b530f281aa2b39df.

Change-Id: Ia58464b6c8417e7798858176171b2ca9f536eda1

7 years ago[Tizen] Fix SVACE issue - change sscanf(%d) to strtol 59/132659/1
minho.sun [Wed, 7 Jun 2017 05:56:39 +0000 (14:56 +0900)]
[Tizen] Fix SVACE issue - change sscanf(%d) to strtol

This reverts commit 22b429f142e1130bc3db8e5b730ae559ba5635fb.

Change-Id: I93e194ace1b6177a8082fce5b80b16e5d26c9f9f

7 years ago[Tizen] Remove profile build dependencies 58/132658/1
minho.sun [Wed, 7 Jun 2017 05:56:23 +0000 (14:56 +0900)]
[Tizen] Remove profile build dependencies

This reverts commit 883f0a09d5d1c78ea002497299e6e25a5d4b998a.

Change-Id: I57ee4efc441d02853ce26b6aaab58d685bab10b9

7 years ago[Tizen] Make all profile have mobile dali_toolkit_profile except tv 57/132657/1
minho.sun [Wed, 7 Jun 2017 05:56:14 +0000 (14:56 +0900)]
[Tizen] Make all profile have mobile dali_toolkit_profile except tv

This reverts commit 2cc8a37835d5c332f1af6846e2a1208345d2e30c.

Change-Id: I6c1c3a772960f4c1e4ccd24459c6c62c1c643eb1

7 years agoMerge branch 'devel/master' into tizen 56/132656/1
minho.sun [Wed, 7 Jun 2017 05:55:54 +0000 (14:55 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: I88623c69468ba25730b9265dbd9a0bad1b803ee7

7 years agoRevert "[Tizen] Make all profile have mobile dali_toolkit_profile except tv" 55/132655/1
minho.sun [Wed, 7 Jun 2017 03:08:41 +0000 (12:08 +0900)]
Revert "[Tizen] Make all profile have mobile dali_toolkit_profile except tv"

This reverts commit 12e5d8f16ae47b8fb6eba6c14d038dab8df4c912.

Change-Id: I6027075a8d243b81ea515200c23e905ecf012138

7 years agoRevert "[Tizen] Remove profile build dependencies" 54/132654/1
minho.sun [Wed, 7 Jun 2017 03:08:32 +0000 (12:08 +0900)]
Revert "[Tizen] Remove profile build dependencies"

This reverts commit c8306b4602f8e1ebfb542cef839da41ccf37ef4e.

Change-Id: If0142281526537f317f02b5f45b758d2985728f4

7 years agoRevert "[Tizen] Fix SVACE issue - change sscanf(%d) to strtol" 53/132653/1
minho.sun [Wed, 7 Jun 2017 03:08:25 +0000 (12:08 +0900)]
Revert "[Tizen] Fix SVACE issue - change sscanf(%d) to strtol"

This reverts commit 5d9359856307ea7c326ea1b41d0cb0717fa072f5.

Change-Id: I269c8d569715bfe6631bb6ddf59ed257a02e54f1

7 years agoRevert "[Tizen] Restore behavior of Uploaded and LoadingFinished signal" 52/132652/1
minho.sun [Wed, 7 Jun 2017 03:08:14 +0000 (12:08 +0900)]
Revert "[Tizen] Restore behavior of Uploaded and LoadingFinished signal"

This reverts commit f3e7e9a264faa49607758b5221c05dac72f7d231.

Change-Id: I1039fb5be3c1835b41b522e2a73803651b9a0ba7

7 years agoChange Visual depth index API from float to int 07/132507/1
Adeel Kazmi [Tue, 6 Jun 2017 09:59:17 +0000 (10:59 +0100)]
Change Visual depth index API from float to int

Change-Id: I08faedcf31235b3d5a62e5e6e44fcddd1c38e98e

7 years agoMerge "(Visuals) If depth index not specified, then visual depth indices are set...
Kimmo Hoikka [Tue, 6 Jun 2017 09:41:54 +0000 (09:41 +0000)]
Merge "(Visuals) If depth index not specified, then visual depth indices are set in order they are registered" into devel/master

7 years ago(Visuals) If depth index not specified, then visual depth indices are set in order... 74/132474/4
Adeel Kazmi [Mon, 5 Jun 2017 12:34:35 +0000 (13:34 +0100)]
(Visuals) If depth index not specified, then visual depth indices are set in order they are registered

Change-Id: I720bbee7cd9588332b759621d204fa7cd20224ff

7 years agoRemove set and map wrappers from ItemView 74/132374/5
Richard Huang [Fri, 2 Jun 2017 15:24:45 +0000 (16:24 +0100)]
Remove set and map wrappers from ItemView

Change-Id: I1e827af982842d6bc3a9ee9fdacb51c88aa77483

7 years agoMerge "Text scroller renderer bug fix" into devel/master
Adeel Kazmi [Mon, 5 Jun 2017 10:19:20 +0000 (10:19 +0000)]
Merge "Text scroller renderer bug fix" into devel/master

7 years agoMerge "Text scroll animation bug fix" into devel/master
Adeel Kazmi [Mon, 5 Jun 2017 10:17:12 +0000 (10:17 +0000)]
Merge "Text scroll animation bug fix" into devel/master

7 years agoMerge "Added style name for styling TextEditor ScrollBar" into devel/master
minho.sun [Mon, 5 Jun 2017 05:27:16 +0000 (05:27 +0000)]
Merge "Added style name for styling TextEditor ScrollBar" into devel/master

7 years ago(Visuals) Change AnchorPoint & Origin defaults to TOP_BEGIN 55/132355/3
Adeel Kazmi [Fri, 2 Jun 2017 11:10:09 +0000 (12:10 +0100)]
(Visuals) Change AnchorPoint & Origin defaults to TOP_BEGIN

Change-Id: I50433bfefc82a13292051586b99832672293eb86

7 years agoMerge "DALi Version 1.2.42" into devel/master
Adeel Kazmi [Fri, 2 Jun 2017 14:13:59 +0000 (14:13 +0000)]
Merge "DALi Version 1.2.42" into devel/master

7 years agoDALi Version 1.2.42 59/132359/1 dali_1.2.42
Nick Holland [Fri, 2 Jun 2017 11:55:51 +0000 (12:55 +0100)]
DALi Version 1.2.42

Change-Id: Idfe8a84e568fdf1b0307690f28dfb3d6f22b1cd4

7 years agoAdd PLACEHOLDER properties to TextEditor 68/130868/7
Seoyeon Kim [Wed, 24 May 2017 07:53:01 +0000 (16:53 +0900)]
Add PLACEHOLDER properties to TextEditor

- PLACEHOLDER_TEXT and PLACEHOLDER_TEXT_COLOR

Change-Id: I137217a863ab1c70a555981b7ea6d6e7778fe91d
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
7 years agoText scroll animation bug fix 91/130691/6
Jinho, Lee [Tue, 23 May 2017 09:52:46 +0000 (18:52 +0900)]
Text scroll animation bug fix

Text scroll animations continue to play even if TextLabel called SetProperty.
Text scroll animations don't be played if TextLabel called SetProperty after setting stop.

Change-Id: I9ecae3c4aea50cf1032d4ee0135b9d7d41701d04

7 years agoText scroller renderer bug fix 76/132276/1
Jinho, Lee [Fri, 2 Jun 2017 05:10:08 +0000 (14:10 +0900)]
Text scroller renderer bug fix

Change-Id: Ia8301de5744ce89a82650a3f1bbec73f0862d4a9

7 years agoMerge "Add read-only property for getting text line count" into devel/master
Heeyong Song [Fri, 2 Jun 2017 04:37:37 +0000 (04:37 +0000)]
Merge "Add read-only property for getting text line count" into devel/master

7 years ago(TextLabel) Ensure auto scrolling respects the horizontal alignment 16/132016/3
Adeel Kazmi [Wed, 31 May 2017 18:09:26 +0000 (19:09 +0100)]
(TextLabel) Ensure auto scrolling respects the horizontal alignment

Change-Id: Ief71a78f83596aceb328d590024a70c2e210d4cd

7 years agoFixed for infinity loop mode 57/130557/6
Jinho, Lee [Tue, 23 May 2017 02:26:15 +0000 (11:26 +0900)]
Fixed for infinity loop mode

StopScrolling logic have been seperated from SetLoopCount

Change-Id: Iddfd0ce5a79d08b7005d4ca3f9121ce3ace8eb55

7 years agoAdd read-only property for getting text line count 32/128932/12
Jinho, Lee [Thu, 11 May 2017 14:24:53 +0000 (23:24 +0900)]
Add read-only property for getting text line count

Change-Id: I316752b0a8b77187d2995b7c8a2ad4be7650b371

7 years agoRemove profile build dependencies 72/129572/4
Seoyeon Kim [Wed, 17 May 2017 04:38:20 +0000 (13:38 +0900)]
Remove profile build dependencies

- From Tizen 4.0, profile dependent build is not allowed.
  So, removed profile macro in .spec file and configure.ac file.

Change-Id: Id8f62eafb78ea87704e00577ffbbf3ecc1d52046
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
7 years agoAdded style name for styling TextEditor ScrollBar 89/131989/1
minho.sun [Wed, 31 May 2017 12:09:27 +0000 (21:09 +0900)]
Added style name for styling TextEditor ScrollBar

Added style name for styling TextEditor ScrollBar.

ScrollBar : TextEditorScrollBar
ScrollBar Indicotor : TextEditorScrollBarIndicator

Change-Id: Icfc6ca896635a26246fc8aee2d8437c675e3768b
Signed-off-by: minho.sun <minho.sun@samsung.com>
7 years ago[Tizen] Restore behavior of Uploaded and LoadingFinished signal 63/131863/1
Jinho, Lee [Wed, 31 May 2017 04:23:57 +0000 (13:23 +0900)]
[Tizen] Restore behavior of Uploaded and LoadingFinished signal

This reverts commit f38c6563a9d4d4f159d67547f6131d97fc7b430a.

Change-Id: I1c30da224f1c631c64ef1a3b9aa55ffc237c0162

7 years ago[Tizen] Fix SVACE issue - change sscanf(%d) to strtol 62/131862/1
Jinho, Lee [Wed, 31 May 2017 04:15:21 +0000 (13:15 +0900)]
[Tizen] Fix SVACE issue - change sscanf(%d) to strtol

This reverts commit 3ff5d09452cb826eb6f2d1d16f21da5342f1a0c1.

Change-Id: Id677eec8d9a5608f211fbf65486005e99bf6a3a3

7 years ago[Tizen] Remove profile build dependencies 61/131861/1
Jinho, Lee [Wed, 31 May 2017 04:11:52 +0000 (13:11 +0900)]
[Tizen] Remove profile build dependencies

This reverts commit acfdcff8ed1cc6669755cf9e086503032d9456a4.

Change-Id: I9983bb7db9709569f241d13b286180e69034edfd

7 years ago[Tizen] Make all profile have mobile dali_toolkit_profile except tv 60/131860/1
Jinho, Lee [Wed, 31 May 2017 02:49:40 +0000 (11:49 +0900)]
[Tizen] Make all profile have mobile dali_toolkit_profile except tv

This reverts commit 6586baf4ad5e3c7002f94c011dc36bb780e729a1.

Change-Id: I444623dd383a2b4cfb492e6b9287377f41eb4503

7 years agoMerge branch 'devel/master' into tizen 59/131859/1
Jinho, Lee [Wed, 31 May 2017 02:30:55 +0000 (11:30 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: Icf648f8ecba282bd38c6aac8b10e49ac83cdbe5b

7 years agoMerge "Fix a crash in ImageVisual in case of an invalid image and changed to render...
Heeyong Song [Wed, 31 May 2017 01:08:33 +0000 (01:08 +0000)]
Merge "Fix a crash in ImageVisual in case of an invalid image and changed to render broken.png in the case" into devel/master

7 years agoText style to return properties(FONT_STYLE) as string 67/130167/3
Jinho, Lee [Fri, 19 May 2017 07:08:54 +0000 (16:08 +0900)]
Text style to return properties(FONT_STYLE) as string

Change-Id: I0365eed729f5beef330b0a1bd2c356fbd0c050bc

7 years agoFix a crash in ImageVisual in case of an invalid image and changed to render broken... 86/131286/4
Heeyong Song [Fri, 26 May 2017 06:54:05 +0000 (15:54 +0900)]
Fix a crash in ImageVisual in case of an invalid image and changed to render broken.png in the case

Change-Id: I21a04494d60a907270a626359b25af283739abf0

7 years agoRevert "[Tizen] Make all profile have mobile dali_toolkit_profile except tv" 90/131790/1
Jinho, Lee [Tue, 30 May 2017 09:22:20 +0000 (18:22 +0900)]
Revert "[Tizen] Make all profile have mobile dali_toolkit_profile except tv"

This reverts commit 1d50ff16036455ab4f6297ce02d76f3a68d72316.

Change-Id: Ib146cdd51185d7f471ba95eb169ee25411a80fd4

7 years agoRevert "[Tizen] Remove profile build dependencies" 89/131789/1
Jinho, Lee [Tue, 30 May 2017 09:22:04 +0000 (18:22 +0900)]
Revert "[Tizen] Remove profile build dependencies"

This reverts commit a97305c0e420841d5bbdea8c27efc3e2ede879e3.

Change-Id: Iaf5aecf63b787c6bb813b95cf2a343f6ec959425

7 years agoRevert "[Tizen] Do nothing when setting focus on same actor" 88/131788/1
Jinho, Lee [Tue, 30 May 2017 09:21:55 +0000 (18:21 +0900)]
Revert "[Tizen] Do nothing when setting focus on same actor"

This reverts commit 9aa8c91afcd462dce04ca182a5aafc4d73e4a1d6.

Change-Id: Ib136b8d5926cbeb9571db93d82de3404b23d7701

7 years agoRevert "[Tizen] Packaging resources depending on resolution" 87/131787/1
Jinho, Lee [Tue, 30 May 2017 09:21:42 +0000 (18:21 +0900)]
Revert "[Tizen] Packaging resources depending on resolution"

This reverts commit b9e0d4a39f6629f1c430186dce5504c3f265b266.

Change-Id: I82e882fdfb14c4ae374cfb70a6703ee6a4ef1186

7 years agoRevert "[Tizen] Fix SVACE issue - change sscanf(%d) to strtol" 86/131786/1
Jinho, Lee [Tue, 30 May 2017 09:21:32 +0000 (18:21 +0900)]
Revert "[Tizen] Fix SVACE issue - change sscanf(%d) to strtol"

This reverts commit b85d6752041b0b00480e8c2ddaed88696cdb21c5.

Change-Id: I96cda90e0442842045924d1b7106142261787e04

7 years agoRevert "[tizen] ResourceReady symbol expose for c# binding" 85/131785/1
Jinho, Lee [Tue, 30 May 2017 09:20:42 +0000 (18:20 +0900)]
Revert "[tizen] ResourceReady symbol expose for c# binding"

This reverts commit d079999fe2ddb4104d79fb48bf68dd212527b377.

Change-Id: I1477d5ffee28607c94478072e3a4705e7f5f7aca

7 years agoRevert "[Tizen] Text style to return properties(FONT_STYLE) as string" 84/131784/1
Jinho, Lee [Tue, 30 May 2017 09:20:26 +0000 (18:20 +0900)]
Revert "[Tizen] Text style to return properties(FONT_STYLE) as string"

This reverts commit 580a3a5de8489adb3ad6d0fcc2802c1a5b00a1c1.

Change-Id: Ie104d6ca204c6c353122bc67035fd89f3d930221

7 years agoRevert "[Tizen] Restore behavior of Uploaded and LoadingFinished signal" 83/131783/1
Jinho, Lee [Tue, 30 May 2017 09:19:43 +0000 (18:19 +0900)]
Revert "[Tizen] Restore behavior of Uploaded and LoadingFinished signal"

This reverts commit 3ce7d36be1ee547fce618d5454a95487ab901581.

Change-Id: Ic2b2aaafe6039c65c2d06d1705e76705756ada10

7 years agoRevert "[Tizen] Use Handle::GetCurrentProperty instead of Devel API" 82/131782/1
Jinho, Lee [Tue, 30 May 2017 09:19:09 +0000 (18:19 +0900)]
Revert "[Tizen] Use Handle::GetCurrentProperty instead of Devel API"

This reverts commit cbff126602567cb9fe4a03fe4a12cde16df00cbf.

Change-Id: I6ba7086ec0c3ceed39f08c599a34f55f4545795e

7 years agoMerge "Fix feedback style error message." into devel/master
Adeel Kazmi [Tue, 30 May 2017 08:47:49 +0000 (08:47 +0000)]
Merge "Fix feedback style error message." into devel/master

7 years agoMerge "Do nothing when setting focus on same actor" into devel/master
Adeel Kazmi [Tue, 30 May 2017 08:34:28 +0000 (08:34 +0000)]
Merge "Do nothing when setting focus on same actor" into devel/master

7 years agoFix feedback style error message. 95/131595/1
minho.sun [Tue, 30 May 2017 06:39:07 +0000 (15:39 +0900)]
Fix feedback style error message.

Fix feedback style error message.
It ocurred because of empty path.

Give default theme path when applying default theme instead of empty path.

Plus, add default-feedback-theme.json to resource package.

Change-Id: I2459cc39a798bf3b86c688275feae8957798bcd9
Signed-off-by: minho.sun <minho.sun@samsung.com>
7 years agoMerge "Removal of unnecessary set and map wrappers" into devel/master
David Steele [Fri, 26 May 2017 17:30:30 +0000 (17:30 +0000)]
Merge "Removal of unnecessary set and map wrappers" into devel/master

7 years agoRemoval of unnecessary set and map wrappers 55/131355/2
Kimmo Hoikka [Fri, 26 May 2017 12:58:02 +0000 (13:58 +0100)]
Removal of unnecessary set and map wrappers

Change-Id: I80338abf1574e3560f400fde69a33787bfc9509a

7 years ago(ControlImpl) Move Visual related APIs to the Devel API 76/131176/6
Adeel Kazmi [Thu, 25 May 2017 17:35:30 +0000 (18:35 +0100)]
(ControlImpl) Move Visual related APIs to the Devel API

Change-Id: I630f37ad03029e907a5d5ed768902ceec8b22c3c

7 years agoDALi Version 1.2.41 46/131346/1 dali_1.2.41
greynaga [Fri, 26 May 2017 12:30:58 +0000 (13:30 +0100)]
DALi Version 1.2.41

Change-Id: I5b051a13ac16deb64058af649b4abe024a40e868

7 years agoCleanup ResourceLoading and PlatformAbstraction 83/129983/3
Kimmo Hoikka [Thu, 18 May 2017 17:06:10 +0000 (18:06 +0100)]
Cleanup ResourceLoading and PlatformAbstraction

- Cleanup in PlatformAbstraction
- Cleaned up code and comments

Change-Id: Iabb992ceb71e865de27588c8a8affd8de002922a

7 years agoMerge "Use Handle::GetCurrentProperty instead of Devel API" into devel/master
Adeel Kazmi [Wed, 24 May 2017 10:14:22 +0000 (10:14 +0000)]
Merge "Use Handle::GetCurrentProperty instead of Devel API" into devel/master

7 years agoRemove dali-swig, enable CXXFLAGS 18/130518/1
Agnelo Vaz [Mon, 22 May 2017 14:20:01 +0000 (15:20 +0100)]
Remove dali-swig, enable CXXFLAGS

Change-Id: I6a4316448539d1104d645f55790a042e00582147

7 years agoDo nothing when setting focus on same actor 53/128453/2
minho.sun [Mon, 10 Apr 2017 03:28:07 +0000 (12:28 +0900)]
Do nothing when setting focus on same actor

Do nothing when setting focus on same actor again.

Change-Id: Ie073856b0019587d71b4ae0f64d8664212e2fccc

7 years ago[Tizen] Use Handle::GetCurrentProperty instead of Devel API 86/130386/2 accepted/tizen/unified/20170523.050756 submit/tizen/20170522.141510 tizen_4.0.m1_release
minho.sun [Mon, 22 May 2017 06:07:09 +0000 (15:07 +0900)]
[Tizen] Use Handle::GetCurrentProperty instead of Devel API

DevelHandle::GetCurrentProperty is moved to public.
So, use Handle::GetCurrentProperty instead of devel.

Change-Id: I28a7679bdcf1c023f11792bf4cd41d4c5000b807
Signed-off-by: minho.sun <minho.sun@samsung.com>
7 years agoUse Handle::GetCurrentProperty instead of Devel API 54/130354/1
minho.sun [Mon, 22 May 2017 06:07:09 +0000 (15:07 +0900)]
Use Handle::GetCurrentProperty instead of Devel API

DevelHandle::GetCurrentProperty is moved to public.
So, use Handle::GetCurrentProperty instead of devel.

Change-Id: Ib2d25e5dcdf954409fc35a9c01b039907c9421b4
Signed-off-by: minho.sun <minho.sun@samsung.com>
7 years agoMerge "[Tizen] Restore behavior of Uploaded and LoadingFinished signal" into tizen
taeyoon0.lee [Fri, 19 May 2017 14:29:53 +0000 (14:29 +0000)]
Merge "[Tizen] Restore behavior of Uploaded and LoadingFinished signal" into tizen

7 years ago[Tizen] Restore behavior of Uploaded and LoadingFinished signal 78/130078/5
taeyoon0.lee [Fri, 19 May 2017 05:03:54 +0000 (14:03 +0900)]
[Tizen] Restore behavior of Uploaded and LoadingFinished signal

 - It is a temporary patch.

Change-Id: I5bb6e2aa44a085de324000f540b76a40ce361f88

7 years agoMerge "DALi Version 1.2.40" into devel/master
Adeel Kazmi [Fri, 19 May 2017 12:45:17 +0000 (12:45 +0000)]
Merge "DALi Version 1.2.40" into devel/master

7 years agoDALi Version 1.2.40 27/130227/1 dali_1.2.40
Francisco Santos [Fri, 19 May 2017 12:43:34 +0000 (13:43 +0100)]
DALi Version 1.2.40

Change-Id: I6f009a096fcdd3b4b05f2cf8da42714a22d8f3d6

7 years ago[Tizen] Text style to return properties(FONT_STYLE) as string 21/130121/2
Jinho, Lee [Fri, 19 May 2017 07:08:54 +0000 (16:08 +0900)]
[Tizen] Text style to return properties(FONT_STYLE) as string

Change-Id: I0365eed729f5beef330b0a1bd2c356fbd0c050bc

7 years agoMerge "Fix RemoveText code in text-controller.cpp" into devel/master
Seoyeon Kim [Fri, 19 May 2017 04:44:04 +0000 (04:44 +0000)]
Merge "Fix RemoveText code in text-controller.cpp" into devel/master

7 years agoSeparate C# classes into Internal and Public 68/127968/18
Umar [Tue, 2 May 2017 18:02:30 +0000 (19:02 +0100)]
Separate C# classes into Internal and Public

Change-Id: I12b90fc0eb411d0d4df9dcbf6d79e70a46cc4fb8

7 years agoFix RemoveText code in text-controller.cpp 61/127661/7
Seoyeon Kim [Fri, 28 Apr 2017 07:37:03 +0000 (16:37 +0900)]
Fix RemoveText code in text-controller.cpp

- There is 'Delete All' key of TV remote control
- If the user wants to 'Delete All' texts focused, then the primary cursor
  has to be situated in the head of texts.

Change-Id: Id56e8dd1ba63130993ffc8a4332b5dd8a9e8c2de
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
7 years agoAdded scrollMode property to ScrollView to simplify Rulers 84/128384/5
David Steele [Tue, 9 May 2017 17:26:48 +0000 (18:26 +0100)]
Added scrollMode property to ScrollView to simplify Rulers

The rulers are hard to use and understand, and require overriding
classes in the public API. This makes binding to C# require too much
effort, and pulls too many classes into C# that otherwise don't need to
be there.

Have instead added a devel property to enable the simplification of
setting up rulers - the new property map will be used internally to
create either DefaultRuler or FixedRuler, depending on the
settings. This makes it very easy to bind to C#.

Change-Id: I5932cd32487bae77b8c41ebd35e35f6bc879be33

7 years ago(KeyboardFocusManager) Use weak handle instead of calling FindChildById repeatedly 64/129664/2
Adeel Kazmi [Wed, 17 May 2017 10:48:06 +0000 (11:48 +0100)]
(KeyboardFocusManager) Use weak handle instead of calling FindChildById repeatedly

Change-Id: Idfd0b4fdafd7d2d844af560f5beaa4f0a68697ef

7 years ago[tizen] ResourceReady symbol expose for c# binding 38/129638/1 accepted/tizen/unified/20170518.061201 submit/tizen/20170517.083100
dongsug.song [Wed, 17 May 2017 08:26:01 +0000 (17:26 +0900)]
[tizen] ResourceReady symbol expose for c# binding

Change-Id: I79036a580078afce1dfc4d29be0e0bd77da3a691
Signed-off-by: dongsug.song <dongsug.song@samsung.com>
7 years ago[Tizen] Fix SVACE issue - change sscanf(%d) to strtol 59/129459/1 accepted/tizen/unified/20170518.061130 submit/tizen/20170517.061745
taeyoon0.lee [Tue, 16 May 2017 11:37:37 +0000 (20:37 +0900)]
[Tizen] Fix SVACE issue - change sscanf(%d) to strtol

This reverts commit a6bfb5a20c362b143e05c81dc662a4ecd717f179.

Change-Id: I11447bd763049e27e7ec1b424cf80678a3f35805

7 years ago[Tizen] Packaging resources depending on resolution 58/129458/1
taeyoon0.lee [Tue, 16 May 2017 11:37:03 +0000 (20:37 +0900)]
[Tizen] Packaging resources depending on resolution

This reverts commit 4dbee52db4877c3429290807b225a033df68e038.

Change-Id: Ibc60a4b97f3ea5b577649c255935f3cd645b9bfe

7 years ago[Tizen] Do nothing when setting focus on same actor 57/129457/1
taeyoon0.lee [Tue, 16 May 2017 11:36:11 +0000 (20:36 +0900)]
[Tizen] Do nothing when setting focus on same actor

This reverts commit 15b61ba8adcc229e3acdae2508b8e4a5701be8a9.

Change-Id: I8dc866ec3e896986b66542eb1df31785834757d3

7 years ago[Tizen] Remove profile build dependencies 56/129456/1
taeyoon0.lee [Tue, 16 May 2017 11:35:34 +0000 (20:35 +0900)]
[Tizen] Remove profile build dependencies

This reverts commit 1a122bacfb4c83e532bdd2e0c74c6826b24975c7.

Change-Id: Iee3f1f9fbc1f7ee0f03364578359ab8d26eb3efd

7 years ago[Tizen] Make all profile have mobile dali_toolkit_profile except tv 55/129455/1
taeyoon0.lee [Tue, 16 May 2017 11:34:57 +0000 (20:34 +0900)]
[Tizen] Make all profile have mobile dali_toolkit_profile except tv

This reverts commit bce55584aa00aff4946b88d2c578903efda2dda0.

Change-Id: I84af9750b81ed61a2c29deee55c826dc2f6e8c57

7 years agoMerge branch 'devel/master (1.2.39+)' into tizen 54/129454/1
taeyoon0.lee [Tue, 16 May 2017 11:33:03 +0000 (20:33 +0900)]
Merge branch 'devel/master (1.2.39+)' into tizen

Change-Id: Ibb09b96ce593a2afdddbcb2dd876dba2a01c3461

7 years agoRevert "[Tizen] Make all profile have mobile dali_toolkit_profile except tv" 53/129453/1
taeyoon0.lee [Tue, 16 May 2017 11:13:42 +0000 (20:13 +0900)]
Revert "[Tizen] Make all profile have mobile dali_toolkit_profile except tv"

This reverts commit c130e4841223f97289e01b102e4d6c8b96e01c57.

Change-Id: I191a1e6d2c21b5424fa28e48639ef4b7b428fdf7

7 years agoRevert "[Tizen] Remove profile build dependencies" 52/129452/1
taeyoon0.lee [Tue, 16 May 2017 11:13:12 +0000 (20:13 +0900)]
Revert "[Tizen] Remove profile build dependencies"

This reverts commit 03ea91899cf4204bd70f6fd4d467174aae0cb150.

Change-Id: I731fb926a5061ac943a5bff4c10c9276b67c0106

7 years agoMerge "Packaging resources depending on resolution" into devel/master
Adeel Kazmi [Tue, 16 May 2017 11:02:05 +0000 (11:02 +0000)]
Merge "Packaging resources depending on resolution" into devel/master

7 years agoRevert "[Tizen] Do nothing when setting focus on same actor" 51/129451/1
taeyoon0.lee [Tue, 16 May 2017 08:14:06 +0000 (17:14 +0900)]
Revert "[Tizen] Do nothing when setting focus on same actor"

This reverts commit bac0444b21e157f604acc9bd91f5876666ddac0c.

Change-Id: I49fe690c350e2e566b934cb8bf610ac2d0295e55

7 years agoRevert "[Tizen] Use old ABI temporarily" 50/129450/1
taeyoon0.lee [Tue, 16 May 2017 08:13:43 +0000 (17:13 +0900)]
Revert "[Tizen] Use old ABI temporarily"

This reverts commit a2090100204f384156ffac570544223307c4a187.

Change-Id: I15db8732c1bb9b6ed2e76aa2cef4906ccdc078ef

7 years agoRevert "[Tizen] Packaging resources depending on resolution" 49/129449/1
taeyoon0.lee [Tue, 16 May 2017 08:13:15 +0000 (17:13 +0900)]
Revert "[Tizen] Packaging resources depending on resolution"

This reverts commit 01fec43ea7410645db7b82a94a1ae30f8f66af6d.

Change-Id: Ia6f6bf2268961b48665f8009d36e56517820027d

7 years agoRevert "[Tizen] Fix SVACE issue - change sscanf(%d) to strtol" 48/129448/1
taeyoon0.lee [Tue, 16 May 2017 08:12:48 +0000 (17:12 +0900)]
Revert "[Tizen] Fix SVACE issue - change sscanf(%d) to strtol"

This reverts commit bdc5c524a6a96ad36194c4e6b58c20ce85237339.

Change-Id: I00d666974bd97e35bcd083e2c9ba557950ca69e3