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
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>
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
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>
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 [Thu, 21 May 2015 15:03:51 +0000 (16:03 +0100)]
Changes after table-view moved to public-api
Change-Id: Ica58c498c6ad3396494717abf90bf622c4d3739f
Paul Wisbey [Mon, 18 May 2015 17:02:44 +0000 (18:02 +0100)]
Supply stylesheet using Application constructor
Change-Id: Ieab919e1ef93b46b66f1049a2845005d94bbf72f
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
Nick Holland [Fri, 8 May 2015 13:15:06 +0000 (14:15 +0100)]
[dali_1.0.41] Merge branch 'tizen'
Change-Id: I5ed50dd8faa1c132908926253f5dfdad40b2564a
Nick Holland [Fri, 8 May 2015 13:14:32 +0000 (14:14 +0100)]
DALi Version 1.0.41
Change-Id: I041904635a70e1dce3a3b6273987a0bcd12a8385
Nick Holland [Fri, 8 May 2015 12:52:32 +0000 (13:52 +0100)]
DALi Version 1.0.41
Change-Id: I041904635a70e1dce3a3b6273987a0bcd12a8385
Lee Morgan [Fri, 1 May 2015 13:50:38 +0000 (14:50 +0100)]
Added JSON shader effect
Change-Id: Ie55026f59d4d956f3982d9ed3ba43e3cf4efa7eb
Paul Wisbey [Wed, 6 May 2015 09:33:04 +0000 (10:33 +0100)]
Show alternative placeholder text in TextField demo
Change-Id: Ibc2346a8655ef94ae67d38324b0302575e7c9179
Adeel Kazmi [Fri, 1 May 2015 17:15:47 +0000 (10:15 -0700)]
Merge "Added JSON shader effect"
Lee Morgan [Fri, 1 May 2015 13:50:38 +0000 (14:50 +0100)]
Added JSON shader effect
Change-Id: Ie55026f59d4d956f3982d9ed3ba43e3cf4efa7eb
Lee Morgan [Wed, 29 Apr 2015 14:34:48 +0000 (15:34 +0100)]
[dali_1.0.40] Merge branch 'tizen'
Change-Id: Id72a4c7a907ee04179c9ef09efdf84dcc2dc8643
Lee Morgan [Wed, 29 Apr 2015 14:34:23 +0000 (15:34 +0100)]
DALi Version 1.0.40
Change-Id: Ic5d6475baaf2586da7f8029323343f35dcf4441d
Paul Wisbey [Thu, 23 Apr 2015 14:03:36 +0000 (15:03 +0100)]
Prefer black text / white backgrounds by default
Change-Id: I192e15bd0127e9b637234eb5525550183abfcf55
Adeel Kazmi [Mon, 27 Apr 2015 09:21:20 +0000 (02:21 -0700)]
Merge "Alpha function changes" into tizen
Ferran Sole [Mon, 20 Apr 2015 13:48:12 +0000 (14:48 +0100)]
Alpha function changes
Change-Id: Iaaea70d0620aa122139ab40f8a00f94493677ac3
Andrew Cox [Mon, 2 Mar 2015 15:39:36 +0000 (15:39 +0000)]
Image Load-time Fitting and Sampling Modes Example
Change-Id: I8558b0e432cbbf2470fc9b80b4178d20663b3758
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
Kingsley Stephens [Fri, 17 Apr 2015 12:15:46 +0000 (13:15 +0100)]
Delete view from toolkit and move cluster into demo
Change-Id: I54fd5e2f166a4f487a6b1e7e5193ad25f5411bd6
Xiangyin Ma [Thu, 23 Apr 2015 11:04:57 +0000 (12:04 +0100)]
[dali_1.0.39] Merge branch 'tizen'
Change-Id: I50aa9e717979370e80fb0312e68d4ec9c7f843ae
Xiangyin Ma [Thu, 23 Apr 2015 11:04:33 +0000 (12:04 +0100)]
DALi Version 1.0.39
Change-Id: I97463b0a4ba89a5950386238150c8f43713eee92
Kimmo Hoikka [Mon, 20 Apr 2015 17:13:52 +0000 (10:13 -0700)]
Merge "Size negotiation patch 4: Remove SetRelayoutEnabled" into tizen
Andrew Cox [Tue, 31 Mar 2015 14:54:06 +0000 (15:54 +0100)]
Cleanup for removal of ImageAttributes from public API
Change-Id: I5bafc645c223b173abdd20db00094c501c846ee4
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
Kingsley Stephens [Tue, 14 Apr 2015 13:01:16 +0000 (14:01 +0100)]
Size negotiation patch 4: Remove SetRelayoutEnabled
Change-Id: I75c664598c9c1d25c491ed67c35e08dd33bf96f6
Kimmo Hoikka [Wed, 15 Apr 2015 19:30:41 +0000 (20:30 +0100)]
Cleaned up Degree, Radian, AngleAxis and Quaternion classes
- Inline Degree, Radian and AngleAxis types to avoid unnecessary exports / export table lookups in using code
- Change AngleAxis to store a Radian angle for better accuracy
- Make Quaternion explicitly take a Radian as constructor
Change-Id: I61d807dc35e8b7b4cc0510b45c5019f12785878a
Kimmo Hoikka [Thu, 16 Apr 2015 13:31:06 +0000 (06:31 -0700)]
Merge "Use Orientation from Window not application class." into tizen
Agnelo Vaz [Tue, 24 Mar 2015 11:00:52 +0000 (11:00 +0000)]
Text Field Scrolling Message Demo
Change-Id: I71b1150a76099b136e1157734269f78ebc7e47a0
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
Ferran Sole [Wed, 15 Apr 2015 11:58:30 +0000 (12:58 +0100)]
[dali_1.0.38] Merge branch 'tizen'
Change-Id: I34e01f36eb917faff4999ef666f60692d80c0433
Ferran Sole [Wed, 15 Apr 2015 11:58:11 +0000 (12:58 +0100)]
DALi Version 1.0.38
Change-Id: I669a41072a93c2eba8f1367657778fc72d53eb70
Nick Holland [Fri, 10 Apr 2015 14:38:55 +0000 (15:38 +0100)]
Use Orientation from Window not application class.
Change-Id: I426313377c97b638fefdb376139f5fa03550ae49
Paul Wisbey [Tue, 14 Apr 2015 14:00:01 +0000 (15:00 +0100)]
Revert to using SetBackgroundColor in text-label.example
Change-Id: I9ef0e8248dac3acdb0bb2b37625b5081739cb1df
Kingsley Stephens [Fri, 10 Apr 2015 09:24:25 +0000 (10:24 +0100)]
Size negotiation patch 3: Scope size negotiation enums
Fix buttons and logging examples
Change-Id: I21699757ea591f73d5a09393caa01fd2b621726c
Paul Wisbey [Mon, 13 Apr 2015 09:04:01 +0000 (10:04 +0100)]
Reduced text size for launcher labels
Change-Id: Idcaadfcdcc7b30aef0a13d7ccbda0ee250c0d15a
Kimmo Hoikka [Fri, 10 Apr 2015 14:51:55 +0000 (07:51 -0700)]
Merge "DALi Version 1.0.37" into tizen
Kingsley Stephens [Fri, 10 Apr 2015 14:36:14 +0000 (15:36 +0100)]
[dali_1.0.37] Merge branch 'tizen'
Change-Id: Ibae4f16083c08db218e766a8707b40548f5d6a95
Kingsley Stephens [Fri, 10 Apr 2015 14:35:39 +0000 (15:35 +0100)]
DALi Version 1.0.37
Change-Id: I2195d137fdc0091f29e395ee5b63b9cf4a90f1d5
Paul Wisbey [Fri, 10 Apr 2015 12:36:43 +0000 (13:36 +0100)]
Show Light text in shadow-bone-lighting example
Change-Id: I0250ce6fedcc6948aa6b4418bb13b5f742a2d960
Kingsley Stephens [Thu, 9 Apr 2015 15:15:21 +0000 (16:15 +0100)]
Fix size negotiation example label centering and wrapping text
Change-Id: I3f19359887fc598f3681b4ddcf55527bddceb7ca
Paul Wisbey [Thu, 9 Apr 2015 16:02:35 +0000 (17:02 +0100)]
Merge branch 'new_text' into tizen
Change-Id: Iff4a8ad638aa654b016d49a1dc07a602618f64be
Paul Wisbey [Thu, 9 Apr 2015 16:00:39 +0000 (17:00 +0100)]
Merge remote-tracking branch 'origin/tizen' into new_text
Conflicts:
demo/dali-demo.cpp
Change-Id: I7588735ebd065e6c00fd8ac1cd40aac9cf475303
Paul Wisbey [Thu, 9 Apr 2015 12:23:19 +0000 (13:23 +0100)]
Merge remote-tracking branch 'origin/tizen' into new_text
Change-Id: Ica8aad6d34fbebf441eb859fb716935aeaf0105f
Kingsley Stephens [Wed, 8 Apr 2015 13:13:18 +0000 (14:13 +0100)]
Size negotiation patch 2: Fix builder example scripts
Change-Id: I6f9e0583cb67a3297039d76759db5ab0ddec18b6
Paul Wisbey [Thu, 9 Apr 2015 10:22:52 +0000 (11:22 +0100)]
Fix to show sliders in path animation example
Change-Id: Ib2dd9aba0fc63a0607c2d0da1c095650fd9ea9d4
Paul Wisbey [Thu, 9 Apr 2015 10:17:35 +0000 (11:17 +0100)]
Fixed dissolve effect issue
Change-Id: I166b928a4b12881dd2a21a753151bf7dfe6ef73e
Agnelo Vaz [Wed, 8 Apr 2015 17:02:05 +0000 (18:02 +0100)]
Label added to Toolbars using correct API not actor Add.
Change-Id: Ifb875f21344436e3a3f210388445af1a00eded08
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
Victor Cebollada [Tue, 7 Apr 2015 14:53:15 +0000 (15:53 +0100)]
Replace a MoveBy by an AnimateBy.
Change-Id: I399401a09e722fd85a026ffc2189e6bd090147f9
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Adeel Kazmi [Tue, 7 Apr 2015 14:46:50 +0000 (15:46 +0100)]
Using New Constraints
Change-Id: I67da11782751f55f9e2a020f5ba269e5baf57ced
Paul Wisbey [Tue, 7 Apr 2015 10:38:23 +0000 (11:38 +0100)]
Merge remote-tracking branch 'origin/tizen' into new_text
Conflicts:
demo/dali-table-view.cpp
examples/item-view/item-view-example.cpp
examples/size-negotiation/size-negotiation-example.cpp
examples/text-view/text-view-example.cpp
Change-Id: I4b9a9eb30ad190b329115ff093120ac06343e26d
Paul Wisbey [Thu, 2 Apr 2015 15:55:22 +0000 (16:55 +0100)]
Updating the builder examples to use TextLabel
Change-Id: I922f38428990ae202109a65bd711629817574d30
Adeel Kazmi [Fri, 3 Apr 2015 05:51:46 +0000 (06:51 +0100)]
[dali_1.0.36] Merge branch 'tizen'
Change-Id: I932fde5506e5de977fc35a8156f2d1d2854d61c0
Adeel Kazmi [Fri, 3 Apr 2015 05:51:28 +0000 (06:51 +0100)]
DALi Version 1.0.36
Change-Id: Ib6ce7c0a390be1d65546b2802da57c0042ec043c
Adeel Kazmi [Thu, 2 Apr 2015 17:57:50 +0000 (10:57 -0700)]
Merge "Size negotiation patch 1: Remove SetPreferred size" into tizen
Adeel Kazmi [Thu, 2 Apr 2015 14:24:05 +0000 (07:24 -0700)]
Merge "Use pre-defined animatable property index in ScrollView" into tizen
Paul Wisbey [Thu, 2 Apr 2015 09:56:48 +0000 (10:56 +0100)]
Fix for TextLabel demo styling
Change-Id: I2844fd73a4bb49389d3df8dc287785ed415d2823
Kingsley Stephens [Thu, 2 Apr 2015 10:37:59 +0000 (11:37 +0100)]
Size negotiation patch 1: Remove SetPreferred size
Change-Id: I33d4a33a2b50e1d5a5debf1a2f5be5f24c97dd0a
Victor Cebollada [Wed, 1 Apr 2015 15:08:52 +0000 (16:08 +0100)]
Fixes for text related actors after new size negotiation.
Change-Id: I289af8a59b4b1f67fc1dbea92b0457194da6847a
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Richard Huang [Wed, 1 Apr 2015 15:03:50 +0000 (16:03 +0100)]
Use pre-defined animatable property index in ScrollView
Change-Id: I60fcc4e9a85e889fb0fe988859a42a87d83acb87
Paul Wisbey [Wed, 1 Apr 2015 13:57:31 +0000 (14:57 +0100)]
Replace TextView with TextLabel (again)
Change-Id: I8ac0787692b34882c2d98717ab778574dbdab7a0
Adeel Kazmi [Wed, 1 Apr 2015 13:53:23 +0000 (14:53 +0100)]
Remove constraints from transition effects demos
Change-Id: I0773bbe89cca6acc654059af25897b52e3c58f9c
Agnelo Vaz [Wed, 1 Apr 2015 12:55:44 +0000 (13:55 +0100)]
Updates to Text Field demo after new Size negotiation API
Change-Id: I52f3b59064ae8c1e6951132b2e3a4c38e7d4b759
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
Paul Wisbey [Tue, 31 Mar 2015 17:19:09 +0000 (18:19 +0100)]
Replace TextView with TextLabel
Change-Id: I5932f0191f358e986fcaace820fb2ecb43b9812b
Paul Wisbey [Mon, 30 Mar 2015 18:33:17 +0000 (19:33 +0100)]
Merge remote-tracking branch 'origin/tizen' into new_text
Conflicts:
demo/dali-demo.cpp
demo/dali-table-view.cpp
examples/builder/examples.cpp
examples/buttons/buttons-example.cpp
examples/item-view/item-view-example.cpp
examples/path-animation/path-animation.cpp
examples/text-view/text-view-example.cpp
shared/view.h
Change-Id: I152b06854b349f0430172227f1d79ee16855fbc0
Heeyong Song [Tue, 31 Mar 2015 02:03:30 +0000 (11:03 +0900)]
Remove non-public APIs of Animation
Change-Id: Idc8fc2369f01eb7cb96635d15c1600fa3c368934
Adeel Kazmi [Mon, 30 Mar 2015 14:41:55 +0000 (07:41 -0700)]
Merge "Size negotiation example" into tizen
Richard Underhill [Fri, 27 Mar 2015 10:46:06 +0000 (10:46 +0000)]
Add shadow toggle and displacement function to text-label example
Change-Id: Ie7dcdc64bf70fea8ab68af85b729fa5a9de0b652
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
Nick Holland [Thu, 26 Mar 2015 17:38:49 +0000 (17:38 +0000)]
JavaScript and JSON command line launcher
Usage:
Will load both JSON and JavaScript file from command line
scripting.example my-scene.json my-script.js
Change-Id: I36330b8bae84a532f57989b4087843d178d03e0b
projects / platform / core / uifw / dali-demo.git / log