platform/core/uifw/dali-demo.git
8 years agoUpdate the scripts with the changed control property and remove cluster demo 95/48295/2
Xiangyin Ma [Thu, 17 Sep 2015 09:04:53 +0000 (10:04 +0100)]
Update the scripts with the changed control property and remove cluster demo

Change-Id: I2d5c022ceee49e7d5732fee4c952f801b72bdcb8

8 years agoDALi Version 1.1.2 63/47963/1 dali_1.1.2
Richard Huang [Thu, 10 Sep 2015 10:05:36 +0000 (11:05 +0100)]
DALi Version 1.1.2

Change-Id: I271639b4d44332759304e608198b17358241e0d1

8 years agoDALi Version 1.1.1 20/46820/1 dali_1.1.1
Lee Morgan [Wed, 26 Aug 2015 10:14:55 +0000 (11:14 +0100)]
DALi Version 1.1.1

Change-Id: If97fc764d066b74277011e5a77f6b5d5f5cbb473

8 years agoPageTurnView demo update 42/46242/2
Xiangyin Ma [Tue, 18 Aug 2015 10:35:35 +0000 (11:35 +0100)]
PageTurnView demo update

Change-Id: Ib3053eb08dc834edc656868289d7124763080b0e

8 years agoDALi Version 1.1.0 55/46455/1 dali_1.1.0
Chu Hoang [Thu, 20 Aug 2015 12:33:18 +0000 (13:33 +0100)]
DALi Version 1.1.0

Change-Id: I1d9b7a8c1cb7753fe22e08195a6b191a754b336c

8 years agoExample of usage of ModelView class 89/44389/13
David Fumanal [Tue, 21 Jul 2015 09:56:56 +0000 (10:56 +0100)]
Example of usage of ModelView class

Change-Id: I2b1abd915988795432a002369617caa3f0fdc1cb

8 years agoMerge "Changed buttons example to use ImageView." into devel/master
Adeel Kazmi [Wed, 12 Aug 2015 13:06:51 +0000 (06:06 -0700)]
Merge "Changed buttons example to use ImageView." into devel/master

8 years agoMerge "Re-apply LAYER_3D drawing order in ItemView demo" into devel/master
Kimmo Hoikka [Wed, 12 Aug 2015 12:18:41 +0000 (05:18 -0700)]
Merge "Re-apply LAYER_3D drawing order in ItemView demo" into devel/master

8 years agoDALi Version 1.0.53 20/45920/1 dali_1.0.53
Adeel Kazmi [Wed, 12 Aug 2015 09:51:03 +0000 (10:51 +0100)]
DALi Version 1.0.53

Change-Id: I96f8837131306cbba8d2138c9689a8b4978b0998

8 years agoChanged buttons example to use ImageView. 81/44381/4
Chu Hoang [Tue, 21 Jul 2015 08:52:18 +0000 (09:52 +0100)]
Changed buttons example to use ImageView.

Change-Id: I8debcef8e1aaf8355167c2fc9d36cc3170d4b619

8 years agoRe-apply LAYER_3D drawing order in ItemView demo 21/45821/1
Paul Wisbey [Tue, 11 Aug 2015 14:08:57 +0000 (15:08 +0100)]
Re-apply LAYER_3D drawing order in ItemView demo

Change-Id: Ie518d47df2a859cc7fb28a5fe40dcc00ee1bb06d

8 years agoMerge "DALi Version 1.0.52" into devel/master
Adeel Kazmi [Thu, 6 Aug 2015 10:24:05 +0000 (03:24 -0700)]
Merge "DALi Version 1.0.52" into devel/master

8 years agoDALi Version 1.0.52 69/45469/1 dali_1.0.52
Xiangyin Ma [Thu, 6 Aug 2015 10:05:48 +0000 (11:05 +0100)]
DALi Version 1.0.52

Change-Id: I19abff8f9031a46410be2690e140c11facbd661b

8 years agoFix text-field example edit popup not showing 07/45407/1
Tom Robinson [Wed, 5 Aug 2015 17:11:02 +0000 (18:11 +0100)]
Fix text-field example edit popup not showing

Change-Id: I97689bed78b824d44a88555a1222f62ce3df8e32

8 years agoMerge "New Popup implementation" into devel/master
Adeel Kazmi [Wed, 5 Aug 2015 15:35:52 +0000 (08:35 -0700)]
Merge "New Popup implementation" into devel/master

8 years agoNew Popup implementation 69/44869/8
Tom Robinson [Tue, 28 Jul 2015 14:18:58 +0000 (15:18 +0100)]
New Popup implementation

Change-Id: I19544f18bd90836c039d045be4ab2d9d5386b37f

8 years agoTextField Demo not to use Demo style sheet 75/45375/3
Agnelo Vaz [Wed, 5 Aug 2015 09:47:00 +0000 (10:47 +0100)]
TextField Demo not to use Demo style sheet

* TextField entries removed from demo style sheets

Once demo styles can be merged with toolkit styles then some of the removed entries can be put back and demo style sheets used

Change-Id: I0047eea7a6bc51177225e20535e413dea3a76fe7
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
8 years agoDALi Version 1.0.51 84/44984/1 dali_1.0.51
Tom Robinson [Thu, 30 Jul 2015 08:26:41 +0000 (09:26 +0100)]
DALi Version 1.0.51

Change-Id: I8af8d73e0ec58d3573c57ce3d52eb6bce8e786a7

8 years agoMerge "Fixed 4 demo json scripts" into devel/master
Adeel Kazmi [Mon, 27 Jul 2015 10:45:40 +0000 (03:45 -0700)]
Merge "Fixed 4 demo json scripts" into devel/master

8 years agoMerge "Cleaned up image scaling and filtering example by removing (commented out...
Adeel Kazmi [Mon, 27 Jul 2015 10:35:55 +0000 (03:35 -0700)]
Merge "Cleaned up image scaling and filtering example by removing (commented out unneeded) SetSortModifier." into devel/master

8 years agoFixed 4 demo json scripts 92/44692/2
Tom Robinson [Fri, 24 Jul 2015 16:03:25 +0000 (17:03 +0100)]
Fixed 4 demo json scripts

Change-Id: I7402521736ed2b2c0a8ccf8aa8139018444dac7d

8 years agoDALi Version 1.0.50 84/44584/1 dali_1.0.50
Richard Huang [Thu, 23 Jul 2015 10:56:23 +0000 (11:56 +0100)]
DALi Version 1.0.50

Change-Id: Ic2910e0733f2097f5d7a0fa3a041143900aec4dc

8 years agoMerge "Changed blocks example to use ImageView." into devel/master
Kimmo Hoikka [Wed, 22 Jul 2015 14:14:45 +0000 (07:14 -0700)]
Merge "Changed blocks example to use ImageView." into devel/master

8 years agoCleaned up image scaling and filtering example by removing (commented out unneeded... 94/44394/2
Chu Hoang [Tue, 21 Jul 2015 10:24:55 +0000 (11:24 +0100)]
Cleaned up image scaling and filtering example by removing (commented out unneeded) SetSortModifier.

Change-Id: I8bed95f8669a9ee5891ab88262f5c559bc3432f1

8 years agoChanged blocks example to use ImageView. 92/44292/1
Chu Hoang [Mon, 20 Jul 2015 16:14:45 +0000 (17:14 +0100)]
Changed blocks example to use ImageView.

Change-Id: I17d52b7bc360fda645494b1e2a0f5fe449d4c9de

8 years agoRemoved Actor API from button. Added Icon properties 94/44094/7
Tom Robinson [Thu, 16 Jul 2015 17:43:02 +0000 (18:43 +0100)]
Removed Actor API from button. Added Icon properties

Change-Id: Ib21ed8b157a7ce22762bc4ee9c04a2bbf5e770b9

8 years agoMerge "Changed some demo examples to use ImageView." into devel/master
Kimmo Hoikka [Fri, 17 Jul 2015 15:05:29 +0000 (08:05 -0700)]
Merge "Changed some demo examples to use ImageView." into devel/master

8 years agoChanged some demo examples to use ImageView. 54/43754/6
Chu Hoang [Mon, 13 Jul 2015 14:30:52 +0000 (15:30 +0100)]
Changed some demo examples to use ImageView.

Change-Id: If2ced48efc39bfc03cc07fb716770d45eb2f42e6

8 years agoDALi Version 1.0.49 54/44154/1 dali_1.0.49
Nick Holland [Fri, 17 Jul 2015 08:25:56 +0000 (09:25 +0100)]
DALi Version 1.0.49

Change-Id: I17d85a279cc0cf8f2954541a3cf4fbf809b7249f

8 years agoMerge "Fixed memory leak in text-field demo" into devel/master
Adeel Kazmi [Thu, 16 Jul 2015 17:02:53 +0000 (10:02 -0700)]
Merge "Fixed memory leak in text-field demo" into devel/master

8 years agoTextField updates to json style files 01/42901/4
Agnelo Vaz [Fri, 3 Jul 2015 16:06:26 +0000 (17:06 +0100)]
TextField updates to json style files

Change-Id: I571058b0f303fb72ec5e46d55234d5950e91f0ba
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
8 years agoFixed memory leak in text-field demo 68/43868/4
Paul Wisbey [Mon, 13 Jul 2015 10:09:01 +0000 (11:09 +0100)]
Fixed memory leak in text-field demo

+ Chose a better cursor color

Change-Id: Ifb6abb311df33c5c30090ecde0a2699035c69fdb

8 years agoRemoval of Actor::Insert API 66/43866/1
Tom Robinson [Tue, 14 Jul 2015 17:13:00 +0000 (18:13 +0100)]
Removal of Actor::Insert API

Change-Id: I8940fb262a864c17942615c37229cb154f955486

8 years agoChanges following the patch: 19/43819/1
Ferran Sole [Tue, 14 Jul 2015 09:53:37 +0000 (10:53 +0100)]
Changes following the patch:
"Changed draw ordering to take into account the depth of the node in the hierarchy"

Change-Id: I19a20705ae42be53023a76dbfea0894533087b39

8 years agoChange DrawMode::OVERLAY to DrawMode::OVERLAY_2D 52/43752/1
Richard Huang [Mon, 13 Jul 2015 13:41:05 +0000 (14:41 +0100)]
Change DrawMode::OVERLAY to DrawMode::OVERLAY_2D

Change-Id: If79d262a37658ab3de84e98abc399c20e135a391

8 years agoMerge "DALi Version 1.0.48" into devel/master
Adeel Kazmi [Thu, 9 Jul 2015 16:11:28 +0000 (09:11 -0700)]
Merge "DALi Version 1.0.48" into devel/master

8 years agoDALi Version 1.0.48 92/43492/1 dali_1.0.48
Lee Morgan [Thu, 9 Jul 2015 14:03:03 +0000 (15:03 +0100)]
DALi Version 1.0.48

Change-Id: I110536b17bb7f6fdc60e80c1a352ac2ad11d1adc

8 years agoRemove UNSIGNED_INTEGER property type (removed from core) 86/43386/2
Kimmo Hoikka [Wed, 8 Jul 2015 14:40:55 +0000 (15:40 +0100)]
Remove UNSIGNED_INTEGER property type (removed from core)

Change-Id: I5bd7eee4565227f2d47a6d269ca4a3f775925bdd

8 years agoMerge "DALi Version 1.0.47" into devel/master
Adeel Kazmi [Wed, 1 Jul 2015 13:23:57 +0000 (06:23 -0700)]
Merge "DALi Version 1.0.47" into devel/master

8 years agoDALi Version 1.0.47 93/42693/1 dali_1.0.47
Ferran Sole [Wed, 1 Jul 2015 13:18:39 +0000 (14:18 +0100)]
DALi Version 1.0.47

Change-Id: I86cd3b11b3c439403d8c0a0bd381ff9e19440220

8 years agoChanged demos to use unselected button images. 33/42533/5
Chu Hoang [Mon, 29 Jun 2015 15:54:51 +0000 (16:54 +0100)]
Changed demos to use unselected button images.

[SRUK] ()

[Issue#]   N/A
[Problem]  N/A
[Cause]    N/A
[Solution] N/A

Change-Id: If2cafffc9545e439994ee5442057004bc2653eab

8 years agoOnActivated() change for Accessibility and KeyboardFocus 99/42399/1
Tom Robinson [Fri, 26 Jun 2015 18:35:59 +0000 (19:35 +0100)]
OnActivated() change for Accessibility and KeyboardFocus

Change-Id: Id26db275107e93fa974ce8cd233861338e54b9ab

8 years agoMerge branch 'devel/new_mesh' into devel/master 97/42397/1
Francisco Santos [Fri, 26 Jun 2015 17:47:18 +0000 (18:47 +0100)]
Merge branch 'devel/new_mesh' into devel/master

Change-Id: I84faa5b88e6cca8f606c5f32d8fb5e18ce0ce27c

8 years agoMerge branch 'devel/master' into devel/new_mesh 89/42389/2
Francisco Santos [Fri, 26 Jun 2015 14:31:51 +0000 (15:31 +0100)]
Merge branch 'devel/master' into devel/new_mesh

Change-Id: I9877668ddf0ca176f873d8157b525f5eae24b0df

8 years agoChanged cluster example layer to have 3D behavior 77/42377/1
Ferran Sole [Fri, 26 Jun 2015 13:45:09 +0000 (14:45 +0100)]
Changed cluster example layer to have 3D behavior

Change-Id: I78ee2b606aeaa4f905f4a68b45d0fa2ae977be9a

8 years agoMerge "Rename AccessibilityFocusManager to AccessibilityManager" into devel/master
Adeel Kazmi [Thu, 25 Jun 2015 15:30:22 +0000 (08:30 -0700)]
Merge "Rename AccessibilityFocusManager to AccessibilityManager" into devel/master

8 years agoMerge branch 'devel/master' into devel/new_mesh 18/42318/1
Francisco Santos [Thu, 25 Jun 2015 14:53:25 +0000 (15:53 +0100)]
Merge branch 'devel/master' into devel/new_mesh

Change-Id: Ie51fa61a8ef7c904635b99c9bf39185c10efd2bf

8 years agoMerge "Update script: table-view.json" into devel/master
Kimmo Hoikka [Thu, 25 Jun 2015 09:20:49 +0000 (02:20 -0700)]
Merge "Update script: table-view.json" into devel/master

8 years agoFixes for demos following change of default behaviour in Layer. 41/42241/1
Francisco Santos [Wed, 24 Jun 2015 15:53:02 +0000 (16:53 +0100)]
Fixes for demos following change of default behaviour in Layer.

Change-Id: I5757490feb24c9cd1e6eee38139fbae848f0255a

8 years agoDALi Version 1.0.46 36/42236/1 dali_1.0.46
Chu Hoang [Wed, 24 Jun 2015 14:54:36 +0000 (15:54 +0100)]
DALi Version 1.0.46

Change-Id: I9b426848869179c2b40e099e09aa9e1c79701e03

8 years agoRemoved DepthIndex methods from public-api 03/42203/3
Richard Underhill [Wed, 24 Jun 2015 11:00:48 +0000 (12:00 +0100)]
Removed DepthIndex methods from public-api

Needs: https://review.tizen.org/gerrit/#/c/42196/
       https://review.tizen.org/gerrit/#/c/42201/

Change-Id: I21487d2896dabf45009393bdf615d128db6842f3
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
8 years agoMove new mesh API to devel-api. 36/42136/4
Francisco Santos [Tue, 23 Jun 2015 13:49:08 +0000 (14:49 +0100)]
Move new mesh API to devel-api.

Change-Id: Ic4e00c7e787229ef38e35217eae5e376f054049e

8 years agoUpdate script: table-view.json 33/42133/2
Xiangyin Ma [Tue, 23 Jun 2015 13:42:51 +0000 (14:42 +0100)]
Update script: table-view.json

Change-Id: I4e7c3b06fd29a7aa0ad76529b09f6303b9118516

8 years agoUpdates following magnifier changes 94/41994/1
Adeel Kazmi [Fri, 19 Jun 2015 13:58:21 +0000 (14:58 +0100)]
Updates following magnifier changes

Change-Id: I9f310da3fc56b87c6e8d24bfc08585bfa9d02bf8

8 years agoRename AccessibilityFocusManager to AccessibilityManager 00/41600/2
Richard Huang [Tue, 16 Jun 2015 13:56:32 +0000 (14:56 +0100)]
Rename AccessibilityFocusManager to AccessibilityManager

Change-Id: Ia10868e413bfb742c53dccda767ccbebf5ae21a3

8 years agoDALi Version 1.0.45 60/41860/1 dali_1.0.45
Xiangyin Ma [Thu, 18 Jun 2015 11:14:30 +0000 (12:14 +0100)]
DALi Version 1.0.45

Change-Id: I3d9b0b7fd1af9ef46697dd694b6d15c21c4b2956

8 years agoRemove dali-any from Property::Value 59/41359/2
Kimmo Hoikka [Fri, 12 Jun 2015 19:12:46 +0000 (20:12 +0100)]
Remove dali-any from Property::Value
- reimplement multivalue using more efficient union inside value
- remove unnecessary asserts when types dont match
- cleanup and sanitize scripting
- remove unnecessary templates from GetEnum, added error handling

Change-Id: If87d7eb6b5a0e3ff32f298cccc670b3f34dd091a

8 years agoRemoved Draw::OVERLAY from Demos. 47/41347/3
Richard Underhill [Fri, 12 Jun 2015 13:41:41 +0000 (14:41 +0100)]
Removed Draw::OVERLAY from Demos.

NEEDS:
https://review.tizen.org/gerrit/#/c/41345/

and

https://review.tizen.org/gerrit/#/c/41346/

Change-Id: I2b66ac6882960400d5b32e26ba9909974a2b30cc
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
8 years agoDALi Version 1.0.44 46/41146/1 dali_1.0.44
Tom Robinson [Thu, 11 Jun 2015 09:46:16 +0000 (10:46 +0100)]
DALi Version 1.0.44

Change-Id: I54a85ce8f45341ce893c058007614e4440d5b3d1

8 years agoUpdate dali-demo menu. 76/40976/3
Francisco Santos [Wed, 10 Jun 2015 12:06:11 +0000 (13:06 +0100)]
Update dali-demo menu.

Change-Id: I3e62364b420a9df327292dc877abb2b69ec6b21e

8 years agoRemove uniform mapping. 53/40853/3
Francisco Santos [Tue, 9 Jun 2015 17:55:29 +0000 (18:55 +0100)]
Remove uniform mapping.

Change-Id: Ib151a33642e16d305cbc278f6ebab58820ce2a2e

8 years agoRemove egl package from dependencies. 56/40756/1
Victor Cebollada [Mon, 8 Jun 2015 17:00:35 +0000 (18:00 +0100)]
Remove egl package from dependencies.

Change-Id: I712e244b55b6a0e8813a56a89c6377d2318990c7
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
8 years agoMerge remote-tracking branch 'origin/tizen' into devel/new_mesh 37/40737/1
Francisco Santos [Mon, 8 Jun 2015 09:56:20 +0000 (10:56 +0100)]
Merge remote-tracking branch 'origin/tizen' into devel/new_mesh

Conflicts:
examples/animated-shapes/animated-shapes-example.cpp
examples/bubble-effect/bubble-effect-example.cpp
examples/new-window/new-window-example.cpp
examples/path-animation/path-animation.cpp

Change-Id: I0e3fe040dfe9faaf9074617294d1fde7f0b7ef67

8 years agoDALi Version 1.0.43 91/40491/1 accepted/tizen_3.0.2015.q2_common tizen_3.0.2015.q2_common accepted/tizen/3.0.2015.q2/common/20150615.091823 accepted/tizen/common/20150611.081707 accepted/tizen/mobile/20150611.091339 accepted/tizen/tv/20150611.091531 accepted/tizen/wearable/20150611.085816 dali_1.0.43 submit/tizen/20150611.012320 submit/tizen_3.0.2015.q2_common/20150615.075539 submit/tizen_mobile/20150611.014034
Richard Huang [Thu, 4 Jun 2015 10:06:14 +0000 (11:06 +0100)]
DALi Version 1.0.43

Change-Id: I54c61b8b44c334b7ef79dbd90c81b402a6649d87

8 years agoMerge "ShaderEffect changes" into devel/new_mesh
Adeel Kazmi [Wed, 3 Jun 2015 15:08:37 +0000 (08:08 -0700)]
Merge "ShaderEffect changes" into devel/new_mesh

8 years agoFixes for removal of animatable property-buffer. 54/40254/2
Francisco Santos [Wed, 3 Jun 2015 12:41:55 +0000 (13:41 +0100)]
Fixes for removal of animatable property-buffer.

Change-Id: I32428f2a5be9009e5f3603ad9567b62b9db62c31

8 years agoRenamed FocusManager to AccessibilityFocusManager 52/40352/2
Richard Huang [Tue, 2 Jun 2015 16:48:48 +0000 (17:48 +0100)]
Renamed FocusManager to AccessibilityFocusManager

Change-Id: Iec4025ccaa95c00a19072cbb42a7b6ba4264b364

8 years agoChanges after 40127, changing control background to 0.f 74/40274/2
Kimmo Hoikka [Mon, 1 Jun 2015 16:31:39 +0000 (17:31 +0100)]
Changes after 40127, changing control background to 0.f

Change-Id: I05897aa4d0df28cab2e19557c80550420972a9b5

8 years agoTextField example added to Dali-demo 69/40269/1
Agnelo Vaz [Mon, 1 Jun 2015 15:43:38 +0000 (16:43 +0100)]
TextField example added to Dali-demo

Change-Id: I66ae6e4c10f46fe17ca1fd4b6d39abc3b39fc367
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
8 years agoShaderEffect changes 02/39602/4
Ferran Sole [Mon, 18 May 2015 18:06:16 +0000 (19:06 +0100)]
ShaderEffect changes

Signed-off-by: Ferran Sole <ferran.sole@samsung.com>
Change-Id: I609dac012a4f1eba1d0838311e4abdc9f768e568

8 years agoMerge "Changes for std::vector removal from api" into tizen
Kimmo Hoikka [Fri, 29 May 2015 17:39:00 +0000 (10:39 -0700)]
Merge "Changes for std::vector removal from api" into tizen

8 years agoFix the wrong keyboard focus in the last page of dali-demo 69/40169/1
Richard Huang [Fri, 29 May 2015 16:39:23 +0000 (17:39 +0100)]
Fix the wrong keyboard focus in the last page of dali-demo

Change-Id: I937f9d2cab2779db646bf96c2c98904e468c1575

8 years agoFix crash when moving keyboard focus to the left in dali-demo 68/40168/1
Richard Huang [Fri, 29 May 2015 16:31:21 +0000 (17:31 +0100)]
Fix crash when moving keyboard focus to the left in dali-demo

Change-Id: I1ea3e1b4519ad9c48f12d3a5baf95111e83a5845

8 years agoMerge "Update keyboard focus direction enum for Control" into tizen
Kimmo Hoikka [Fri, 29 May 2015 15:57:17 +0000 (08:57 -0700)]
Merge "Update keyboard focus direction enum for Control" into tizen

8 years agoAdding New Folder Image for TextField Demo 57/40157/4
Agnelo Vaz [Fri, 29 May 2015 13:48:51 +0000 (14:48 +0100)]
Adding New Folder Image for TextField Demo

Change-Id: I5022e715803acfe04b84046b2e61e5c3826c50fe
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
8 years agoUpdate keyboard focus direction enum for Control 39/40139/2
Richard Huang [Fri, 29 May 2015 10:39:36 +0000 (11:39 +0100)]
Update keyboard focus direction enum for Control

Change-Id: I8652c8be27a99b86d4af4ea6557a3d7f4d8d4aba

8 years agoChanges for std::vector removal from api 61/40161/2
Lee Morgan [Fri, 29 May 2015 13:52:11 +0000 (14:52 +0100)]
Changes for std::vector removal from api

Change-Id: I9f0acd2d9f4c70911e883d6637772e62c5e509e7

8 years agoStop using Z-position hacks in text-label.example 30/40130/1
Paul Wisbey [Fri, 29 May 2015 09:56:24 +0000 (10:56 +0100)]
Stop using Z-position hacks in text-label.example

(also stop hiding the text with mGrabCorner)

Change-Id: I74c91714615e44384c1baadfc74621bd9f11c4f9

8 years agoMerge "TextField Demo to use Popup and Label interaction" into tizen
Paul Wisbey [Fri, 29 May 2015 09:36:39 +0000 (02:36 -0700)]
Merge "TextField Demo to use Popup and Label interaction" into tizen

8 years agoDALi Version 1.0.42 09/40109/1 accepted/tizen/common/20150529.134055 dali_1.0.42 submit/tizen/20150529.082236
Adeel Kazmi [Fri, 29 May 2015 08:01:34 +0000 (09:01 +0100)]
DALi Version 1.0.42

Change-Id: Ib5a83c7729f9ac5ac426af2a7cac9adfeb240028

8 years agoTextField Demo to use Popup and Label interaction 59/40059/3
Agnelo Vaz [Thu, 28 May 2015 10:49:39 +0000 (11:49 +0100)]
TextField Demo to use Popup and Label interaction

Change-Id: Ib515e9d7d5c854408832bd3eb94ee6626d396ad2
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
8 years agoUpdated needed for Internal::Control cleanup 13/40013/1 accepted/tizen/common/20150529.134111 accepted/tizen/mobile/20150529.134838 accepted/tizen/tv/20150529.134913 accepted/tizen/wearable/20150529.134856 submit/tizen/20150529.084413
Kimmo Hoikka [Wed, 27 May 2015 14:52:06 +0000 (15:52 +0100)]
Updated needed for Internal::Control cleanup

Change-Id: I017f05ad58a7c52c6c6d348835dcbbec025a3091

8 years agoRemove unnecessary use of ImageActor from bubble-demo 35/39935/1 accepted/tizen/mobile/20150604.121242 accepted/tizen/tv/20150604.121300 accepted/tizen/wearable/20150604.121342 submit/tizen_mobile/20150604.084537 submit/tizen_tv/20150604.084545 submit/tizen_wearable/20150604.084552
Kimmo Hoikka [Tue, 26 May 2015 15:22:04 +0000 (16:22 +0100)]
Remove unnecessary use of ImageActor from bubble-demo

Change-Id: Iba0598878f2816bf2bce28c6daefb9d6ddca1140

9 years agoUpdate with the change of Orientation in adaptor 04/39804/1
Xiangyin Ma [Fri, 22 May 2015 16:16:28 +0000 (17:16 +0100)]
Update with the change of Orientation in adaptor

Change-Id: I6aafe45472d4e9d564af9873faa277b17d4d39fa

9 years agoMerge "Update refraction-effect & radial-menu to use new mesh" into devel/new_mesh
Adeel Kazmi [Fri, 22 May 2015 15:33:09 +0000 (08:33 -0700)]
Merge "Update refraction-effect & radial-menu to use new mesh" into devel/new_mesh

9 years agoMerge "Add bubble-effect-example & new-window-example back to dali-demo" into devel...
Adeel Kazmi [Fri, 22 May 2015 13:17:03 +0000 (06:17 -0700)]
Merge "Add bubble-effect-example & new-window-example back to dali-demo" into devel/new_mesh

9 years agoAdd bubble-effect-example & new-window-example back to dali-demo 03/39603/4
Xiangyin Ma [Tue, 19 May 2015 10:47:59 +0000 (11:47 +0100)]
Add bubble-effect-example & new-window-example back to dali-demo

Change-Id: Iaa2d8ff06f7e401a8d9892772e4500aa8fe97ca1

9 years agoAdded a mesh sorting and blending example 96/38696/5
David Steele [Fri, 24 Apr 2015 16:12:51 +0000 (17:12 +0100)]
Added a mesh sorting and blending example

Displays 6 actors with different materials, alternating
opaque and transparent actors.
Actor 5 has the same material as Actor 1.

Clicking an actor will change it's depth index ( > value means drawn later )
Clicking outside the actors will change the Z values of all the actors

Change-Id: I37640dcbc98774e86948f6c26d7e6718ebb00a6b
Signed-off-by: David Steele <david.steele@partner.samsung.com>
9 years agoUpdate refraction-effect & radial-menu to use new mesh 57/39357/7
Xiangyin Ma [Wed, 13 May 2015 12:53:10 +0000 (13:53 +0100)]
Update refraction-effect & radial-menu to use new mesh

Change-Id: I6007af3cd1f01b9e8845b9edf8cbbffdf2eef6c6

9 years agoChanges after table-view moved to public-api 40/39740/1
Adeel Kazmi [Thu, 21 May 2015 15:03:51 +0000 (16:03 +0100)]
Changes after table-view moved to public-api

Change-Id: Ica58c498c6ad3396494717abf90bf622c4d3739f

9 years agoMinor Fixes to demos 42/38942/3
David Steele [Thu, 30 Apr 2015 18:22:25 +0000 (19:22 +0100)]
Minor Fixes to demos

Change-Id: I089eedc9dc7ca3a14fe3a1b43d7a4e75ebc653ad

9 years agoSupply stylesheet using Application constructor 57/39557/5
Paul Wisbey [Mon, 18 May 2015 17:02:44 +0000 (18:02 +0100)]
Supply stylesheet using Application constructor

Change-Id: Ieab919e1ef93b46b66f1049a2845005d94bbf72f

9 years agoMerge remote-tracking branch 'origin/tizen' into devel/new_mesh 04/39604/1
Francisco Santos [Tue, 19 May 2015 10:55:33 +0000 (11:55 +0100)]
Merge remote-tracking branch 'origin/tizen' into devel/new_mesh

Conflicts:
examples/animated-shapes/animated-shapes-example.cpp
examples/new-window/new-window-example.cpp
examples/path-animation/path-animation.cpp
examples/radial-menu/radial-menu-example.cpp
examples/radial-menu/radial-sweep-view-impl.h
examples/radial-menu/radial-sweep-view.cpp
examples/refraction-effect/refraction-effect-example.cpp

Change-Id: I9da2bc5f3145cd179535081fca2d2504f4fd6cd6

9 years agoMove more public-api headers to devel-api. PART 3 89/39589/1
Nick Holland [Tue, 19 May 2015 07:46:24 +0000 (08:46 +0100)]
Move more public-api headers to devel-api. PART 3

Support for changes to dali-toolkit

Change-Id: I887617b627fccb1e24e5bcff9644e21cf9f01cde

9 years agoMove more public-api headers to devel-api. PART 2 92/39492/1
Nick Holland [Fri, 15 May 2015 11:10:08 +0000 (12:10 +0100)]
Move more public-api headers to devel-api. PART 2

Support for changes to dali-core header file locations

Change-Id: Ief6b52be1f061517bc0d8d5abed61fea4a463ab1

9 years agoSupport for devel-api folder 06/39206/4
Nick Holland [Mon, 11 May 2015 14:36:19 +0000 (15:36 +0100)]
Support for devel-api folder

Change-Id: Ic8bf6bcc2c19c7d919fea0de9120b0f991523f3e

9 years agoRemoved unused scroll-view effect changes 16/39416/4
Ferran Sole [Thu, 14 May 2015 13:44:15 +0000 (14:44 +0100)]
Removed unused scroll-view effect changes

Change-Id: I6555f2a4ca0578641c3a53d7ad1b217fa46c1c9a

9 years agoMerge "Added PropertyValue Array as a class" into tizen
Kimmo Hoikka [Thu, 14 May 2015 15:37:55 +0000 (08:37 -0700)]
Merge "Added PropertyValue Array as a class" into tizen

9 years agoAdded PropertyValue Array as a class 04/39404/3
Lee Morgan [Tue, 12 May 2015 14:55:23 +0000 (15:55 +0100)]
Added PropertyValue Array as a class

Change-Id: I440f386a091b41e4695d681ae56031eaa9b3710e

9 years agoFix the builder demo to activate ItemView layout properly 12/39412/1
Richard Huang [Thu, 14 May 2015 12:37:40 +0000 (13:37 +0100)]
Fix the builder demo to activate ItemView layout properly

Change-Id: I566306c6ab23c18cf2cdb1c210f798575e794c50