Adeel Kazmi [Wed, 23 Dec 2015 17:22:36 +0000 (17:22 +0000)]
[dali_1.1.15] Merge branch 'devel/master'
Change-Id: I5d7d7dc5a210c75eceb26aeec96f019ac99ba269
Adeel Kazmi [Wed, 23 Dec 2015 17:22:00 +0000 (17:22 +0000)]
DALi Version 1.1.15
Change-Id: Icbfb4b565b3d4e203a7ede1ac246826cdb32324b
Ferran Sole [Fri, 4 Dec 2015 13:11:29 +0000 (13:11 +0000)]
Changed benchmark to use ImageView by default
-ImageView is used by default
-ImageActor can still be used if the command line option "--use-image-actor" is specified
-Fixed bug on HideAnimation
Change-Id: Ib9664b7a99a142681bfdbe9ebb3ab457069d6cf7
Xiangyin Ma [Fri, 4 Dec 2015 17:32:23 +0000 (17:32 +0000)]
Added SuperBlur & Bloom demo
Change-Id: I0de724d4efd822db22db18e2b411263a0f56f10c
Adeel Kazmi [Fri, 11 Dec 2015 18:40:29 +0000 (10:40 -0800)]
Merge "Update the ShaderEffect script to resize the geometry" into devel/master
David Steele [Fri, 11 Dec 2015 14:42:37 +0000 (14:42 +0000)]
[dali_1.1.14] Merge branch 'devel/master'
Change-Id: I94f71cafbb9905ca9fbe6aee30a74be2fddd454f
David Steele [Fri, 11 Dec 2015 14:42:05 +0000 (14:42 +0000)]
DALi Version 1.1.14
Change-Id: I757b36ee3797eca40a3be8b67f73c7b23a81ff70
Xiangyin Ma [Wed, 9 Dec 2015 17:52:37 +0000 (17:52 +0000)]
Update the ShaderEffect script to resize the geometry
Change-Id: Ie7298f5bbd6bb3c4dea7aef4930f15345a97b173
Adeel Kazmi [Thu, 10 Dec 2015 17:59:11 +0000 (17:59 +0000)]
Change dali-builder background colour to WHITE
Change-Id: I42df9f8118c56a963c5f37d7a1da61d7cf72f17d
Tom Robinson [Thu, 26 Nov 2015 17:51:17 +0000 (17:51 +0000)]
Implement image fitting modes
Change-Id: Id3088e4f8b6158266b1531a28c1d71b89ac86b95
Adeel Kazmi [Mon, 7 Dec 2015 14:48:59 +0000 (14:48 +0000)]
(Popup) Fix back/ESC key handling & ToastPopup
Change-Id: Ibab6ccde4b3ed1d26e75bacc10f3e96c506b8f2d
Xiangyin Ma [Fri, 4 Dec 2015 11:03:54 +0000 (11:03 +0000)]
[dali_1.1.13] Merge branch 'devel/master'
Change-Id: I7fa7ecc066846b9e63ac604d7034872cef9a4bd8
Xiangyin Ma [Fri, 4 Dec 2015 11:03:14 +0000 (11:03 +0000)]
DALi Version 1.1.13
Change-Id: Idcd01e1277c1eaae6cb75544c060389c3c22702f
Kimmo Hoikka [Wed, 2 Dec 2015 14:00:26 +0000 (06:00 -0800)]
Merge "Metaballs demos" into devel/master
Adeel Kazmi [Wed, 2 Dec 2015 12:28:24 +0000 (12:28 +0000)]
Added clock script to check animation time
Change-Id: Id65b42e32fdd4b6ed391480f2f40a50071815ea0
David Fumanal [Thu, 26 Nov 2015 17:01:59 +0000 (17:01 +0000)]
Metaballs demos
Change-Id: I76fac1d60cdfb919e1948e9b4e8cafe070aad335
Xiangyin Ma [Mon, 30 Nov 2015 15:06:45 +0000 (15:06 +0000)]
Remove ImageActor from Demo
Change-Id: I597a13e0c249bdbd20b33e57ecc55e16fdfa8c77
Adeel Kazmi [Fri, 27 Nov 2015 13:42:12 +0000 (13:42 +0000)]
(TextLabel Example) Fixed Pan gesture handling
Problem: When we are resizing and go past the minimum size of the container and then release, we have to move
the distance we moved from the minimum size to the our release point again in order to make the
container resize again.
Reason: This was because we kept on changing mLayoutSize but did not reset it when the pan starts.
Solution: Reset mLayoutSize when the pan starts.
Change-Id: I3ded29691e8f1c405847f971d9a89d50aa448fdf
Adeel Kazmi [Fri, 27 Nov 2015 10:17:56 +0000 (10:17 +0000)]
[dali_1.1.12] Merge branch 'devel/master'
Change-Id: I0390b5264c5c6c45caba85dcdd77e2d955c772f6
Adeel Kazmi [Fri, 27 Nov 2015 10:17:26 +0000 (10:17 +0000)]
DALi Version 1.1.12
Change-Id: I82f013d5c5c781acca3886a8d157a2a64f2021cb
Richard Huang [Fri, 20 Nov 2015 10:58:53 +0000 (10:58 +0000)]
[dali_1.1.11] Merge branch 'devel/master'
Change-Id: I0b46b3d93eb35506f70be536ed5de59f887c3295
Richard Huang [Fri, 20 Nov 2015 10:58:23 +0000 (10:58 +0000)]
DALi Version 1.1.11
Change-Id: Ib6b75a5a29448cd7e87cb4ee374fc44146205987
Xiangyin Ma [Wed, 18 Nov 2015 18:51:26 +0000 (18:51 +0000)]
Update the slider script example
Change-Id: I1759e3f574cc35876abc5fdeb75a9d2e4934bd0b
Kimmo Hoikka [Tue, 17 Nov 2015 18:17:28 +0000 (10:17 -0800)]
Merge "Changed dali demo table to use custom shaders for the stencil 9-patch image." into devel/master
Adeel Kazmi [Fri, 13 Nov 2015 16:34:29 +0000 (16:34 +0000)]
[dali_1.1.10] Merge branch 'devel/master'
Change-Id: If2984f6a1a387ea654c7a427d6fc64dd353c11ad
Adeel Kazmi [Fri, 13 Nov 2015 16:33:59 +0000 (16:33 +0000)]
DALi Version 1.1.10
Change-Id: Ied10532c95a7aa1c49b87249bc879736721aa10e
Chu Hoang [Fri, 13 Nov 2015 14:04:38 +0000 (14:04 +0000)]
Changed dali demo table to use custom shaders for the stencil 9-patch image.
Updated the item-background-9.png to look nicer.
Change-Id: Ied0c432abac9448dfe6c34bc594358e0334fa7fd
Adeel Kazmi [Wed, 11 Nov 2015 11:00:52 +0000 (11:00 +0000)]
Fix various Klocwork errors
Change-Id: Ieafb91449fe2f4431206c5e3b449f0b26fd10b13
Lee Morgan [Fri, 6 Nov 2015 13:47:35 +0000 (13:47 +0000)]
Always print version with dali-builder
Change-Id: Ib50fdc7505a238115df0b2dd0dbe246022d1acca
Adeel Kazmi [Fri, 6 Nov 2015 11:55:59 +0000 (03:55 -0800)]
Merge "Changed Item View example to no longer use ImageActor or a custom texture atlas." into devel/master
Tom Robinson [Fri, 6 Nov 2015 10:37:37 +0000 (10:37 +0000)]
[dali_1.1.9] Merge branch 'devel/master'
Change-Id: I85f0b96947654217eef755d2e8d0b2d6fb5e53a4
Tom Robinson [Fri, 6 Nov 2015 10:37:10 +0000 (10:37 +0000)]
DALi Version 1.1.9
Change-Id: If57f3813648b47a811fdc62ed94e9142cece567c
Chu Hoang [Mon, 26 Oct 2015 12:01:24 +0000 (12:01 +0000)]
Changed Item View example to no longer use ImageActor or a custom texture atlas.
Change-Id: I819cd9de6ff49c0d86046aa4f2738f87f21c4a16
Adeel Kazmi [Mon, 2 Nov 2015 18:40:44 +0000 (18:40 +0000)]
Changes following the property & singal name changes
Change-Id: I5d09c3ba92dca882a6ae3e1765cb105ddad66bec
Xiangyin Ma [Tue, 27 Oct 2015 15:46:43 +0000 (15:46 +0000)]
Update Atlas demo
Change-Id: Iccdf7248363a76cb264a5559c11dbed4edbf73bd
Ferran Sole [Fri, 30 Oct 2015 11:07:37 +0000 (11:07 +0000)]
Added key event handling to image-view-example
To allow quitting example with escape or back key
Change-Id: Icaa30d4991ee2f65e8c10e4fc136f52de05168cd
Nick Holland [Thu, 29 Oct 2015 10:32:33 +0000 (10:32 +0000)]
[dali_1.1.8] Merge branch 'devel/master'
Change-Id: I0a13417c13f05c2e20da7bfda68fff7ce0fbdab8
Nick Holland [Thu, 29 Oct 2015 10:32:02 +0000 (10:32 +0000)]
DALi Version 1.1.8
Change-Id: Ia37d31f8d4e4b0f1d54a9da109c8e0bd159191a6
Kimmo Hoikka [Tue, 27 Oct 2015 14:29:15 +0000 (07:29 -0700)]
Merge "Adding Image View example demostrating changing, adding and removing ImageViews." into devel/master
Kimmo Hoikka [Tue, 27 Oct 2015 14:25:06 +0000 (07:25 -0700)]
Merge "Changed Cube Transition example to use new CubeTransitionEffect." into devel/master
Chu Hoang [Wed, 21 Oct 2015 09:01:22 +0000 (10:01 +0100)]
Changed Cube Transition example to use new CubeTransitionEffect.
Change-Id: I93d0cede01c9afd0239ba0230cd082ee4acacd25
Chu Hoang [Tue, 25 Aug 2015 10:27:09 +0000 (11:27 +0100)]
Adding Image View example demostrating changing, adding and removing ImageViews.
Change-Id: I4a0238a90a26201086e412369da0170435e1a86b
Chu Hoang [Fri, 23 Oct 2015 14:25:39 +0000 (15:25 +0100)]
Fixed benchmark example comment about flag names.
Change-Id: Id633e6b967f901734d12643f6693ba20759988fc
Adeel Kazmi [Fri, 23 Oct 2015 14:19:27 +0000 (07:19 -0700)]
Merge "DALi Version 1.1.7" into devel/master
Kimmo Hoikka [Fri, 23 Oct 2015 13:05:07 +0000 (06:05 -0700)]
Merge "Changed Shadow example to use ImageView." into devel/master
Lee Morgan [Fri, 23 Oct 2015 10:01:09 +0000 (11:01 +0100)]
[dali_1.1.7] Merge branch 'devel/master'
Change-Id: Icf5d9e2bffe4d282c415a2b48b41ab562fc4fb81
Lee Morgan [Fri, 23 Oct 2015 10:00:44 +0000 (11:00 +0100)]
DALi Version 1.1.7
Change-Id: I6a31b30255d5a0d53d17ac8d2d75dba1539617b0
Chu Hoang [Fri, 16 Oct 2015 15:08:21 +0000 (16:08 +0100)]
Changed Shadow example to use ImageView.
Change-Id: Id5e73e4214bc1c88d66bf89d5f50da5a7f9be01b
Chu Hoang [Thu, 15 Oct 2015 14:19:20 +0000 (15:19 +0100)]
Removal of more ImageActor usage from examples.
Change-Id: I85a641655c2a1f1691fd53a217ee1600d5a45165
Chu Hoang [Mon, 12 Oct 2015 15:26:24 +0000 (16:26 +0100)]
Removed more ImageActor usage from dali-demo.
Change-Id: If925dd14b7f6091136ec4fdd0c879c53ee43a1ff
Kimmo Hoikka [Wed, 14 Oct 2015 09:36:21 +0000 (02:36 -0700)]
Merge "Changed benchmark example to use image urls directly when creating ImageViews." into devel/master
Chu Hoang [Tue, 13 Oct 2015 13:33:24 +0000 (14:33 +0100)]
Changed benchmark example to use image urls directly when creating ImageViews.
Change-Id: Ie6e970a2df6812d1a0daea4758159c98eebe487d
Ferran Sole [Wed, 7 Oct 2015 09:23:22 +0000 (10:23 +0100)]
Changes following "Remove Sampler scene object"
Change-Id: I5c99b4c1b27d0f3b8fc8102620f5f8e6e90f399b
Kimmo Hoikka [Mon, 12 Oct 2015 12:26:19 +0000 (13:26 +0100)]
Remove some dead code from dali-demo
Change-Id: Ia265405b98d66d6c45fcff7d157a62c45b93b198
Tom Robinson [Fri, 9 Oct 2015 09:49:23 +0000 (10:49 +0100)]
[dali_1.1.6] Merge branch 'devel/master'
Change-Id: Idd8bc6beeb4fd5e1253ae19e6227abebd4883c18
Tom Robinson [Fri, 9 Oct 2015 09:48:51 +0000 (10:48 +0100)]
DALi Version 1.1.6
Change-Id: Ia0cd02c19c09302aaf71e311c9630b70f0b0d998
Kimmo Hoikka [Mon, 5 Oct 2015 13:17:50 +0000 (06:17 -0700)]
Merge "Another change to Image Scaling Irregular Grid example to not use deprecated ImageView::GetImage method." into devel/master
Chu Hoang [Wed, 23 Sep 2015 13:40:26 +0000 (14:40 +0100)]
Another change to Image Scaling Irregular Grid example to not use deprecated ImageView::GetImage method.
Change-Id: I9d1ff6792eb7b664c9453f2f25ee5cc180754268
Xiangyin Ma [Fri, 2 Oct 2015 17:46:07 +0000 (18:46 +0100)]
Change the colors in demo laucher
Change-Id: I5dbe51d7bd65a18fc150acadd4d8ffe15b9c5546
Kimmo Hoikka [Mon, 5 Oct 2015 09:47:00 +0000 (02:47 -0700)]
Merge "Added nine patch images to Benchmark example." into devel/master
Chu Hoang [Fri, 2 Oct 2015 14:05:40 +0000 (15:05 +0100)]
Added nine patch images to Benchmark example.
use the --use-ninepatch command flag to use nine patch images.
Change-Id: Ie14eacdf938066343a1d75f6738a3c1dd65a7e81
Xiangyin Ma [Fri, 2 Oct 2015 09:32:20 +0000 (10:32 +0100)]
Added demo of color gradients
Change-Id: I9d1467c53e20d278084499c201b138047d590448
Ferran Sole [Fri, 25 Sep 2015 14:28:30 +0000 (15:28 +0100)]
Added demo to compare performance between ImageActor and ImageView
By default, the application consist of 10 pages of 25x25 ImageActors.
The default values can be modified using the following command line arguments:
-r NumberOfRows (Modifies the number of rows per page)
-c NumberOfColumns (Modifies the number of columns per page)
-p NumberOfPages (Modifies the nimber of pages )
--use-imageview ( Use ImageView instead of ImageActor )
--use-mesh ( Use new renderer API (as ImageView) but shares renderers between actors when possible )
Change-Id: I8a54bd713672433a6f80726972f15d698509dbbe
Chu Hoang [Fri, 2 Oct 2015 09:39:25 +0000 (10:39 +0100)]
[dali_1.1.5] Merge branch 'devel/master'
Change-Id: I8b97ae3e3b353a8aa123a4499baffbf6f83d41c9
Chu Hoang [Fri, 2 Oct 2015 09:38:55 +0000 (10:38 +0100)]
DALi Version 1.1.5
Change-Id: I9cbeacbec2990011a1c770608e7cff45e2bd6bb2
Chu Hoang [Tue, 29 Sep 2015 14:53:40 +0000 (15:53 +0100)]
Changed Dissolve effect to use new custom shaders.
Change-Id: I6fe378deddef85558569c8b4d323ddbb79f6421b
Xiangyin Ma [Thu, 24 Sep 2015 16:16:33 +0000 (17:16 +0100)]
Set launcher background from stylesheet
Change-Id: I3bb7ab3711311431cd0cbff0abc2cfdd11ee616d
Ferran Sole [Wed, 30 Sep 2015 11:06:46 +0000 (12:06 +0100)]
Bug fix: Image Scaling Grid example doesn't show "crossbars"
Change-Id: I9dbf15948401036c144535596960b4b2271fc489
Ferran Sole [Tue, 29 Sep 2015 09:42:16 +0000 (10:42 +0100)]
Bug fix: ItemView example's multiple selection checkbox renders below the image
Also fixes a bug where the checkbox of the first items was not being rendered
Change-Id: I7d6b9edec90f1997dc1e9baab0c911e4bb5d74ff
Agnelo Vaz [Fri, 25 Sep 2015 15:59:21 +0000 (16:59 +0100)]
Text-Font example added
* Added to test Font setting via Property system and system font changes.
* 3 Initial TextLabels;
first has no font set,
second is set via the demo json style sheet,
third is set via the SetProperty in code.
Only the first should change when the system font changes to a different font
* Pressing button creates a new TextLabel with the system font
Change-Id: I9291797ba357979d9b3d85ab0d3a30a3fbd6c497
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
Kimmo Hoikka [Fri, 25 Sep 2015 14:35:33 +0000 (07:35 -0700)]
Merge "Fixed texture mesh example after changed uniform precedence." into devel/master
Adeel Kazmi [Fri, 25 Sep 2015 07:46:40 +0000 (08:46 +0100)]
[dali_1.1.4] Merge branch 'devel/master'
Change-Id: I7f47ab256aadbcae617e5e4cf5d871ec1a2f669c
Adeel Kazmi [Fri, 25 Sep 2015 07:46:14 +0000 (08:46 +0100)]
DALi Version 1.1.4
Change-Id: I92e974a578824d940629dd2ff1f6b32f260f29df
Ferran Sole [Wed, 23 Sep 2015 09:35:57 +0000 (10:35 +0100)]
Fixed texture mesh example after changed uniform precedence.
Now actor's properties have precedence over Renderers properties as uniforms
Change-Id: Ie893579e3d59bfa4bc4b1b99939b0bf236c2efdd
Chu Hoang [Fri, 18 Sep 2015 12:19:31 +0000 (13:19 +0100)]
Changed Image Scaling Irregular Grid example to not use deprecated ImageView::GetImage method.
Change-Id: I0f513af3b3a8c2c128dbfe06533874e740ae701d
Xiangyin Ma [Fri, 18 Sep 2015 10:03:50 +0000 (11:03 +0100)]
[dali_1.1.3] Merge branch 'devel/master'
Change-Id: I75388697198ce58d653791a600d0cfb233cd9c5d
Xiangyin Ma [Fri, 18 Sep 2015 10:03:25 +0000 (11:03 +0100)]
DALi Version 1.1.3
Change-Id: I056891670adc11824ac3cb34778fcedb70934972
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
Richard Huang [Thu, 10 Sep 2015 10:06:10 +0000 (11:06 +0100)]
[dali_1.1.2] Merge branch 'devel/master'
Change-Id: Ief4bf79343a635dade4f8fbe2d5ed5e449c9f5c1
Richard Huang [Thu, 10 Sep 2015 10:05:36 +0000 (11:05 +0100)]
DALi Version 1.1.2
Change-Id: I271639b4d44332759304e608198b17358241e0d1
Lee Morgan [Wed, 26 Aug 2015 10:15:26 +0000 (11:15 +0100)]
[dali_1.1.1] Merge branch 'devel/master'
Change-Id: Ie82817e14cd7ae8a260538acd8b7c9584675f27e
Lee Morgan [Wed, 26 Aug 2015 10:14:55 +0000 (11:14 +0100)]
DALi Version 1.1.1
Change-Id: If97fc764d066b74277011e5a77f6b5d5f5cbb473
Xiangyin Ma [Tue, 18 Aug 2015 10:35:35 +0000 (11:35 +0100)]
PageTurnView demo update
Change-Id: Ib3053eb08dc834edc656868289d7124763080b0e
Chu Hoang [Thu, 20 Aug 2015 12:33:43 +0000 (13:33 +0100)]
[dali_1.1.0] Merge branch 'devel/master'
Change-Id: I821720f0a12d9a2597522954afea05f3d8d33f3f
Chu Hoang [Thu, 20 Aug 2015 12:33:18 +0000 (13:33 +0100)]
DALi Version 1.1.0
Change-Id: I1d9b7a8c1cb7753fe22e08195a6b191a754b336c
David Fumanal [Tue, 21 Jul 2015 09:56:56 +0000 (10:56 +0100)]
Example of usage of ModelView class
Change-Id: I2b1abd915988795432a002369617caa3f0fdc1cb
Adeel Kazmi [Wed, 12 Aug 2015 13:06:51 +0000 (06:06 -0700)]
Merge "Changed buttons example to use ImageView." 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
Adeel Kazmi [Wed, 12 Aug 2015 09:51:56 +0000 (10:51 +0100)]
[dali_1.0.53] Merge branch 'devel/master'
Change-Id: Ib6cf7d502bdad9d60146e8a2ba44d8195f23deea
Adeel Kazmi [Wed, 12 Aug 2015 09:51:03 +0000 (10:51 +0100)]
DALi Version 1.0.53
Change-Id: I96f8837131306cbba8d2138c9689a8b4978b0998
Chu Hoang [Tue, 21 Jul 2015 08:52:18 +0000 (09:52 +0100)]
Changed buttons example to use ImageView.
Change-Id: I8debcef8e1aaf8355167c2fc9d36cc3170d4b619
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
Adeel Kazmi [Thu, 6 Aug 2015 10:24:05 +0000 (03:24 -0700)]
Merge "DALi Version 1.0.52" into devel/master
Xiangyin Ma [Thu, 6 Aug 2015 10:06:14 +0000 (11:06 +0100)]
[dali_1.0.52] Merge branch 'devel/master'
Change-Id: Ia13a95fcd42557640732f7f956ce95e64d9ad163
Xiangyin Ma [Thu, 6 Aug 2015 10:05:48 +0000 (11:05 +0100)]
DALi Version 1.0.52
Change-Id: I19abff8f9031a46410be2690e140c11facbd661b
Tom Robinson [Wed, 5 Aug 2015 17:11:02 +0000 (18:11 +0100)]
Fix text-field example edit popup not showing
Change-Id: I97689bed78b824d44a88555a1222f62ce3df8e32
Adeel Kazmi [Wed, 5 Aug 2015 15:35:52 +0000 (08:35 -0700)]
Merge "New Popup implementation" into devel/master
Tom Robinson [Tue, 28 Jul 2015 14:18:58 +0000 (15:18 +0100)]
New Popup implementation
Change-Id: I19544f18bd90836c039d045be4ab2d9d5386b37f
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>
Tom Robinson [Thu, 30 Jul 2015 08:27:09 +0000 (09:27 +0100)]
[dali_1.0.51] Merge branch 'devel/master'
Change-Id: I4158037be5f4b512560da8a06ea3f1f7c35b7745