Tom Robinson [Thu, 30 Jul 2015 08:27:09 +0000 (09:27 +0100)]
[dali_1.0.51] Merge branch 'devel/master'
Change-Id: I4158037be5f4b512560da8a06ea3f1f7c35b7745
Tom Robinson [Thu, 30 Jul 2015 08:26:41 +0000 (09:26 +0100)]
DALi Version 1.0.51
Change-Id: I8af8d73e0ec58d3573c57ce3d52eb6bce8e786a7
Adeel Kazmi [Mon, 27 Jul 2015 10:45:40 +0000 (03:45 -0700)]
Merge "Fixed 4 demo json scripts" into devel/master
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
Tom Robinson [Fri, 24 Jul 2015 16:03:25 +0000 (17:03 +0100)]
Fixed 4 demo json scripts
Change-Id: I7402521736ed2b2c0a8ccf8aa8139018444dac7d
Richard Huang [Thu, 23 Jul 2015 10:56:48 +0000 (11:56 +0100)]
[dali_1.0.50] Merge branch 'devel/master'
Change-Id: Ie3455de5c35e480ca9aae279d17e9fca8ce0b964
Richard Huang [Thu, 23 Jul 2015 10:56:23 +0000 (11:56 +0100)]
DALi Version 1.0.50
Change-Id: Ic2910e0733f2097f5d7a0fa3a041143900aec4dc
Kimmo Hoikka [Wed, 22 Jul 2015 14:14:45 +0000 (07:14 -0700)]
Merge "Changed blocks example to use ImageView." into devel/master
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
Chu Hoang [Mon, 20 Jul 2015 16:14:45 +0000 (17:14 +0100)]
Changed blocks example to use ImageView.
Change-Id: I17d52b7bc360fda645494b1e2a0f5fe449d4c9de
Tom Robinson [Thu, 16 Jul 2015 17:43:02 +0000 (18:43 +0100)]
Removed Actor API from button. Added Icon properties
Change-Id: Ib21ed8b157a7ce22762bc4ee9c04a2bbf5e770b9
Kimmo Hoikka [Fri, 17 Jul 2015 15:05:29 +0000 (08:05 -0700)]
Merge "Changed some demo examples to use ImageView." into devel/master
Chu Hoang [Mon, 13 Jul 2015 14:30:52 +0000 (15:30 +0100)]
Changed some demo examples to use ImageView.
Change-Id: If2ced48efc39bfc03cc07fb716770d45eb2f42e6
Nick Holland [Fri, 17 Jul 2015 08:26:22 +0000 (09:26 +0100)]
[dali_1.0.49] Merge branch 'devel/master'
Change-Id: Ieaa69fde05176af58de6161fdce4b9dd80fd5ffb
Nick Holland [Fri, 17 Jul 2015 08:25:56 +0000 (09:25 +0100)]
DALi Version 1.0.49
Change-Id: I17d85a279cc0cf8f2954541a3cf4fbf809b7249f
Adeel Kazmi [Thu, 16 Jul 2015 17:02:53 +0000 (10:02 -0700)]
Merge "Fixed memory leak in text-field demo" into devel/master
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>
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
Tom Robinson [Tue, 14 Jul 2015 17:13:00 +0000 (18:13 +0100)]
Removal of Actor::Insert API
Change-Id: I8940fb262a864c17942615c37229cb154f955486
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
Richard Huang [Mon, 13 Jul 2015 13:41:05 +0000 (14:41 +0100)]
Change DrawMode::OVERLAY to DrawMode::OVERLAY_2D
Change-Id: If79d262a37658ab3de84e98abc399c20e135a391
Adeel Kazmi [Thu, 9 Jul 2015 16:11:28 +0000 (09:11 -0700)]
Merge "DALi Version 1.0.48" into devel/master
Lee Morgan [Thu, 9 Jul 2015 14:12:38 +0000 (15:12 +0100)]
[dali_1.0.48] Merge branch 'devel/master'
Change-Id: I8cf011d2c88f6a1547393af7a3d7d34951feb9f6
Lee Morgan [Thu, 9 Jul 2015 14:03:03 +0000 (15:03 +0100)]
DALi Version 1.0.48
Change-Id: I110536b17bb7f6fdc60e80c1a352ac2ad11d1adc
Kimmo Hoikka [Wed, 8 Jul 2015 14:40:55 +0000 (15:40 +0100)]
Remove UNSIGNED_INTEGER property type (removed from core)
Change-Id: I5bd7eee4565227f2d47a6d269ca4a3f775925bdd
Adeel Kazmi [Wed, 1 Jul 2015 13:23:57 +0000 (06:23 -0700)]
Merge "DALi Version 1.0.47" into devel/master
Ferran Sole [Wed, 1 Jul 2015 13:19:29 +0000 (14:19 +0100)]
[dali_1.0.47] Merge branch 'devel/master'
Change-Id: Idfb420921d1a4ba7321af334d4310aac55aed742
Ferran Sole [Wed, 1 Jul 2015 13:18:39 +0000 (14:18 +0100)]
DALi Version 1.0.47
Change-Id: I86cd3b11b3c439403d8c0a0bd381ff9e19440220
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
Tom Robinson [Fri, 26 Jun 2015 18:35:59 +0000 (19:35 +0100)]
OnActivated() change for Accessibility and KeyboardFocus
Change-Id: Id26db275107e93fa974ce8cd233861338e54b9ab
Francisco Santos [Fri, 26 Jun 2015 17:47:18 +0000 (18:47 +0100)]
Merge branch 'devel/new_mesh' into devel/master
Change-Id: I84faa5b88e6cca8f606c5f32d8fb5e18ce0ce27c
Francisco Santos [Fri, 26 Jun 2015 14:31:51 +0000 (15:31 +0100)]
Merge branch 'devel/master' into devel/new_mesh
Change-Id: I9877668ddf0ca176f873d8157b525f5eae24b0df
Ferran Sole [Fri, 26 Jun 2015 13:45:09 +0000 (14:45 +0100)]
Changed cluster example layer to have 3D behavior
Change-Id: I78ee2b606aeaa4f905f4a68b45d0fa2ae977be9a
Adeel Kazmi [Thu, 25 Jun 2015 15:30:22 +0000 (08:30 -0700)]
Merge "Rename AccessibilityFocusManager to AccessibilityManager" into devel/master
Francisco Santos [Thu, 25 Jun 2015 14:53:25 +0000 (15:53 +0100)]
Merge branch 'devel/master' into devel/new_mesh
Change-Id: Ie51fa61a8ef7c904635b99c9bf39185c10efd2bf
Kimmo Hoikka [Thu, 25 Jun 2015 09:20:49 +0000 (02:20 -0700)]
Merge "Update script: table-view.json" into devel/master
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
Chu Hoang [Wed, 24 Jun 2015 14:55:07 +0000 (15:55 +0100)]
[dali_1.0.46] Merge branch 'devel/master'
Change-Id: I84b588ac741620f9c1796a1c68016ffafaf88fc8
Chu Hoang [Wed, 24 Jun 2015 14:54:36 +0000 (15:54 +0100)]
DALi Version 1.0.46
Change-Id: I9b426848869179c2b40e099e09aa9e1c79701e03
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>
Francisco Santos [Tue, 23 Jun 2015 13:49:08 +0000 (14:49 +0100)]
Move new mesh API to devel-api.
Change-Id: Ic4e00c7e787229ef38e35217eae5e376f054049e
Xiangyin Ma [Tue, 23 Jun 2015 13:42:51 +0000 (14:42 +0100)]
Update script: table-view.json
Change-Id: I4e7c3b06fd29a7aa0ad76529b09f6303b9118516
Adeel Kazmi [Fri, 19 Jun 2015 13:58:21 +0000 (14:58 +0100)]
Updates following magnifier changes
Change-Id: I9f310da3fc56b87c6e8d24bfc08585bfa9d02bf8
Richard Huang [Tue, 16 Jun 2015 13:56:32 +0000 (14:56 +0100)]
Rename AccessibilityFocusManager to AccessibilityManager
Change-Id: Ia10868e413bfb742c53dccda767ccbebf5ae21a3
Xiangyin Ma [Thu, 18 Jun 2015 11:15:00 +0000 (12:15 +0100)]
[dali_1.0.45] Merge branch 'devel/master'
Change-Id: I73fe6b49c26c6bbb91b142f1e185941a12bac305
Xiangyin Ma [Thu, 18 Jun 2015 11:14:30 +0000 (12:14 +0100)]
DALi Version 1.0.45
Change-Id: I3d9b0b7fd1af9ef46697dd694b6d15c21c4b2956
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
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>
Tom Robinson [Thu, 11 Jun 2015 09:46:40 +0000 (10:46 +0100)]
[dali_1.0.44] Merge branch 'devel/master'
Change-Id: I8b9a47976b4d0490544b2be0a95ab0622789598f
Tom Robinson [Thu, 11 Jun 2015 09:46:16 +0000 (10:46 +0100)]
DALi Version 1.0.44
Change-Id: I54a85ce8f45341ce893c058007614e4440d5b3d1
Francisco Santos [Wed, 10 Jun 2015 12:06:11 +0000 (13:06 +0100)]
Update dali-demo menu.
Change-Id: I3e62364b420a9df327292dc877abb2b69ec6b21e
Francisco Santos [Tue, 9 Jun 2015 17:55:29 +0000 (18:55 +0100)]
Remove uniform mapping.
Change-Id: Ib151a33642e16d305cbc278f6ebab58820ce2a2e
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>
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
Richard Huang [Thu, 4 Jun 2015 10:06:46 +0000 (11:06 +0100)]
[dali_1.0.43] Merge branch 'tizen'
Change-Id: I3f5e19c1e72727115078bedd42037e66eac878e2
Richard Huang [Thu, 4 Jun 2015 10:06:14 +0000 (11:06 +0100)]
DALi Version 1.0.43
Change-Id: I54c61b8b44c334b7ef79dbd90c81b402a6649d87
Adeel Kazmi [Wed, 3 Jun 2015 15:08:37 +0000 (08:08 -0700)]
Merge "ShaderEffect changes" into devel/new_mesh
Francisco Santos [Wed, 3 Jun 2015 12:41:55 +0000 (13:41 +0100)]
Fixes for removal of animatable property-buffer.
Change-Id: I32428f2a5be9009e5f3603ad9567b62b9db62c31
Richard Huang [Tue, 2 Jun 2015 16:48:48 +0000 (17:48 +0100)]
Renamed FocusManager to AccessibilityFocusManager
Change-Id: Iec4025ccaa95c00a19072cbb42a7b6ba4264b364
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
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>
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
Kimmo Hoikka [Fri, 29 May 2015 17:39:00 +0000 (10:39 -0700)]
Merge "Changes for std::vector removal from api" into tizen
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
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
Kimmo Hoikka [Fri, 29 May 2015 15:57:17 +0000 (08:57 -0700)]
Merge "Update keyboard focus direction enum for Control" into tizen
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>
Richard Huang [Fri, 29 May 2015 10:39:36 +0000 (11:39 +0100)]
Update keyboard focus direction enum for Control
Change-Id: I8652c8be27a99b86d4af4ea6557a3d7f4d8d4aba
Lee Morgan [Fri, 29 May 2015 13:52:11 +0000 (14:52 +0100)]
Changes for std::vector removal from api
Change-Id: I9f0acd2d9f4c70911e883d6637772e62c5e509e7
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
Paul Wisbey [Fri, 29 May 2015 09:36:39 +0000 (02:36 -0700)]
Merge "TextField Demo to use Popup and Label interaction" into tizen
Adeel Kazmi [Fri, 29 May 2015 08:01:56 +0000 (09:01 +0100)]
[dali_1.0.42] Merge branch 'tizen'
Change-Id: I6652169f0298f16e105618aa8a9ff9e6e36f3027
Adeel Kazmi [Fri, 29 May 2015 08:01:34 +0000 (09:01 +0100)]
DALi Version 1.0.42
Change-Id: Ib5a83c7729f9ac5ac426af2a7cac9adfeb240028
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>
Kimmo Hoikka [Wed, 27 May 2015 14:52:06 +0000 (15:52 +0100)]
Updated needed for Internal::Control cleanup
Change-Id: I017f05ad58a7c52c6c6d348835dcbbec025a3091
Kimmo Hoikka [Tue, 26 May 2015 15:22:04 +0000 (16:22 +0100)]
Remove unnecessary use of ImageActor from bubble-demo
Change-Id: Iba0598878f2816bf2bce28c6daefb9d6ddca1140
Xiangyin Ma [Fri, 22 May 2015 16:16:28 +0000 (17:16 +0100)]
Update with the change of Orientation in adaptor
Change-Id: I6aafe45472d4e9d564af9873faa277b17d4d39fa
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
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
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
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>
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
Adeel Kazmi [Thu, 21 May 2015 15:03:51 +0000 (16:03 +0100)]
Changes after table-view moved to public-api
Change-Id: Ica58c498c6ad3396494717abf90bf622c4d3739f
David Steele [Thu, 30 Apr 2015 18:22:25 +0000 (19:22 +0100)]
Minor Fixes to demos
Change-Id: I089eedc9dc7ca3a14fe3a1b43d7a4e75ebc653ad
Paul Wisbey [Mon, 18 May 2015 17:02:44 +0000 (18:02 +0100)]
Supply stylesheet using Application constructor
Change-Id: Ieab919e1ef93b46b66f1049a2845005d94bbf72f
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
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
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
Nick Holland [Mon, 11 May 2015 14:36:19 +0000 (15:36 +0100)]
Support for devel-api folder
Change-Id: Ic8bf6bcc2c19c7d919fea0de9120b0f991523f3e
Ferran Sole [Thu, 14 May 2015 13:44:15 +0000 (14:44 +0100)]
Removed unused scroll-view effect changes
Change-Id: I6555f2a4ca0578641c3a53d7ad1b217fa46c1c9a
Kimmo Hoikka [Thu, 14 May 2015 15:37:55 +0000 (08:37 -0700)]
Merge "Added PropertyValue Array as a class" into tizen
Lee Morgan [Tue, 12 May 2015 14:55:23 +0000 (15:55 +0100)]
Added PropertyValue Array as a class
Change-Id: I440f386a091b41e4695d681ae56031eaa9b3710e
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
Adeel Kazmi [Wed, 13 May 2015 16:48:33 +0000 (17:48 +0100)]
Updates after ItemLayout changes
- ItemView Demo:
- Fade in/out animation between layouts
- Removed menu
- No animations when adding/deleting/replacing items
- Items in spiral layout are a lot closer together
- Builder Examples Demo
- No visible changes
- Size Negotiation Demo
- One button per line rather than two
Change-Id: I2d50a49e49fb2271f41715daec74469ea2aa112b
Richard Huang [Thu, 7 May 2015 12:17:59 +0000 (13:17 +0100)]
Updated demo for ScrollBar and ScrollView API changes
Change-Id: I126a9ea79d3784dbf3357f7b5fb2af6d145815a2
Ferran Sole [Wed, 6 May 2015 08:29:50 +0000 (09:29 +0100)]
Modified scroll-view-example to use path based scroll view effects
Change-Id: Iebf13abe6ef65c880afa22c1010d5350a40c1067
Nick Holland [Tue, 12 May 2015 17:57:16 +0000 (18:57 +0100)]
Removed use of ActorContainer
Change-Id: I185bf4da3387871dd264444d91328879c72cb319
Nick Holland [Tue, 12 May 2015 14:25:37 +0000 (15:25 +0100)]
Removed navigation control JSON file
Change-Id: I22ca6b3c21d09bd569b2d63d9df9050f1397fd73
Adeel Kazmi [Mon, 11 May 2015 14:45:18 +0000 (15:45 +0100)]
Fix version issues with 1.0.41
Change-Id: Ifd3f9da40caefe89caab105d03167a977b31182e
Nick Holland [Fri, 8 May 2015 14:33:07 +0000 (07:33 -0700)]
Revert "DALi Version 1.0.41"
This reverts commit
8e073e809cf13a74699ccfa8f683d34ac26c6421.
Change-Id: I11d8dcf0812fb1c349eb1513332a28f650c5e3ca