platform/core/uifw/dali-demo.git
7 years agoRemove batching from homescreen benchmark. 36/113936/1
Francisco Santos [Thu, 9 Feb 2017 09:50:40 +0000 (09:50 +0000)]
Remove batching from homescreen benchmark.

Change-Id: Ic4f20d0c4169cdedd20a2966edc67da5ec539849

7 years agoCreate ImageView with shader and Image at the same time 61/113461/2
Nick Holland [Tue, 7 Feb 2017 16:08:45 +0000 (16:08 +0000)]
Create ImageView with shader and Image at the same time

Change-Id: If22c12af7072927646e60ee320bd4e58f0702cb7

7 years agoSplit shaders in JSONs over multiple lines 72/112172/3
Adeel Kazmi [Thu, 26 Jan 2017 18:36:47 +0000 (18:36 +0000)]
Split shaders in JSONs over multiple lines

Change-Id: I231d03ba20e15626ed7d6020d65fbbac3411ccff

7 years agoMerge "Update progress bar example" into devel/master
Adeel Kazmi [Mon, 6 Feb 2017 14:05:49 +0000 (06:05 -0800)]
Merge "Update progress bar example" into devel/master

7 years agoMerge "Javanese, Sundanese, Xhosa and Zulu strigns added." into devel/master
Paul Wisbey [Fri, 3 Feb 2017 16:12:48 +0000 (08:12 -0800)]
Merge "Javanese, Sundanese, Xhosa and Zulu strigns added." into devel/master

7 years agoMerge "DALi Version 1.2.25" into devel/master
David Steele [Fri, 3 Feb 2017 15:41:44 +0000 (07:41 -0800)]
Merge "DALi Version 1.2.25" into devel/master

7 years agoDALi Version 1.2.25 15/113015/1 dali_1.2.25
Umar [Fri, 3 Feb 2017 15:37:56 +0000 (15:37 +0000)]
DALi Version 1.2.25

Change-Id: I81a6105c8f4fb499e05103b74ad5f0861100ea27

7 years agoJavanese, Sundanese, Xhosa and Zulu strigns added. 07/113007/1
Victor Cebollada [Fri, 3 Feb 2017 14:21:11 +0000 (14:21 +0000)]
Javanese, Sundanese, Xhosa and Zulu strigns added.

Change-Id: If4baf934350fe467695f69e20a0d222651ac7824
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
7 years agoFix SVACE error caused by uninitialised member 38/112938/1
Adeel Kazmi [Fri, 3 Feb 2017 09:41:56 +0000 (09:41 +0000)]
Fix SVACE error caused by uninitialised member

Change-Id: Idd4cae871e9003c1f7535dcceb4bc6f26e7fbb51

7 years agoUpdate progress bar example 77/111077/8
minho.sun [Thu, 19 Jan 2017 10:05:40 +0000 (19:05 +0900)]
Update progress bar example

Update progress bar example.

There are three new buttons to check new properies of Progress bar.

Change-Id: I9bf0607e3fb3763b37ca88c80040d9713b731169
Signed-off-by: minho.sun <minho.sun@samsung.com>
7 years agoCube transition example to use ToggleButton for effect changes 92/112192/3
Agnelo Vaz [Fri, 27 Jan 2017 11:27:31 +0000 (11:27 +0000)]
Cube transition example to use ToggleButton for effect changes

Change-Id: Ib4484df7478e578817a6663838271bf7a6d87461

7 years agoDALi Version 1.2.24 05/112205/1 dali_1.2.24
Nick Holland [Fri, 27 Jan 2017 15:14:50 +0000 (15:14 +0000)]
DALi Version 1.2.24

Change-Id: I0e7100883cb682fc58b3761eae52c8415391a3f0

7 years agoRemoved Atlas example 07/111907/2
Ferran Sole [Tue, 24 Jan 2017 17:57:39 +0000 (17:57 +0000)]
Removed Atlas example

Change-Id: I48cb4bef5d1e5bcb9f32bbd3e04cf186387dcce3

7 years agoRemoved NOOP page position setters 91/111891/1
Paul Wisbey [Tue, 24 Jan 2017 13:41:14 +0000 (13:41 +0000)]
Removed NOOP page position setters

ScrollViewPagePathEffect is supplying the real positions

Change-Id: I4697ad3b5f341eb075ec7cda4bf3e1a636a6da6e

7 years agoDALi Version 1.2.23 88/111488/1 dali_1.2.23
Richard Huang [Fri, 20 Jan 2017 13:36:22 +0000 (13:36 +0000)]
DALi Version 1.2.23

Change-Id: Ie8c74ec167bfdb8403d9f72ed2f5667df94161f3

7 years agoMerge "(Clipping Example) Add a rotation effect around the X-axis as we scroll throug...
Kimmo Hoikka [Wed, 18 Jan 2017 12:54:33 +0000 (04:54 -0800)]
Merge "(Clipping Example) Add a rotation effect around the X-axis as we scroll through the item-view" into devel/master

7 years ago(Clipping Example) Add a rotation effect around the X-axis as we scroll through the... 80/110880/1
Adeel Kazmi [Wed, 18 Jan 2017 10:23:04 +0000 (10:23 +0000)]
(Clipping Example) Add a rotation effect around the X-axis as we scroll through the item-view

Change-Id: I4a485a758d54ca01c0bf5c2dc3d2162f27810241

7 years agoUpdate the AnimatedImageVisual demo 92/110492/4
Xiangyin Ma [Mon, 16 Jan 2017 19:03:50 +0000 (19:03 +0000)]
Update the AnimatedImageVisual demo

Change-Id: Ic7f90ed9cc5d59e3cdcd2741691c8d927b4e9037

7 years agoMerge "DALi Version 1.2.22" into devel/master
David Steele [Fri, 13 Jan 2017 14:37:29 +0000 (06:37 -0800)]
Merge "DALi Version 1.2.22" into devel/master

7 years agoDALi Version 1.2.22 94/110294/1 dali_1.2.22
David Steele [Fri, 13 Jan 2017 14:35:56 +0000 (14:35 +0000)]
DALi Version 1.2.22

Change-Id: I3ff7abffe275e0efba00daa1695f3c8485718536

7 years agoUpdated transition example to animate tick 87/109287/4
David Steele [Mon, 9 Jan 2017 19:06:14 +0000 (19:06 +0000)]
Updated transition example to animate tick

The animation uses the pixel area and size to animate the tick when
the checkbox is enabled / disabled

Change-Id: I6fdae6b2d6eb0b36a499a2730dca279d539945f0
Signed-off-by: David Steele <david.steele@samsung.com>
7 years agoAdded application to test visual transition framework 37/106737/8
David Steele [Tue, 20 Dec 2016 19:45:22 +0000 (19:45 +0000)]
Added application to test visual transition framework

This application shows a possible implementation of a shadowed button, with
transition animation defined by the style sheet.

Change-Id: Ib764dacdeed2381d96474059ef830e17a2cb9fff
Signed-off-by: David Steele <david.steele@samsung.com>
7 years agoUse Property:LABEL instead of SetLabelText for buttons 97/109797/2
Agnelo Vaz [Wed, 11 Jan 2017 15:56:17 +0000 (15:56 +0000)]
Use Property:LABEL instead of SetLabelText for buttons

Change-Id: I905c14141ad4f207c8bcbb3c29d68c1f698f0530

7 years agoRemove the usage of deprecated Button APIS 24/110024/1
Xiangyin Ma [Thu, 12 Jan 2017 11:48:22 +0000 (11:48 +0000)]
Remove the usage of deprecated Button APIS

Exclude SetLabelText() which will be replaced after the LABEL property supports both MAP and STRING type.

Change-Id: I7aae9bdacbe85ff8b07f0e0ac122db2f50bf24bc

7 years agoMerge "Keep c++ flags from environment." into devel/master
Kimmo Hoikka [Wed, 11 Jan 2017 13:53:42 +0000 (05:53 -0800)]
Merge "Keep c++ flags from environment." into devel/master

7 years agoEnsure environment variable DALI_APPLICATION_PACKAGE get set regardless of desktop... 58/109058/4
Adeel Kazmi [Fri, 6 Jan 2017 17:12:17 +0000 (17:12 +0000)]
Ensure environment variable DALI_APPLICATION_PACKAGE get set regardless of desktop or target builds

This is required for older Tizen builds.

Change-Id: Ia81e14360ce657c2b8f1a0809c36649ed17f51a8

7 years agoReduce size of shape images used in dali-demo 56/109056/1
Adeel Kazmi [Fri, 6 Jan 2017 15:51:21 +0000 (15:51 +0000)]
Reduce size of shape images used in dali-demo

Change-Id: Id05789e07cc0d9db87ee8df1f5823ca909a13693

7 years agoMerge "Replaced buffer image generation in dali-demo with simple images" into devel...
Kimmo Hoikka [Fri, 6 Jan 2017 15:40:20 +0000 (07:40 -0800)]
Merge "Replaced buffer image generation in dali-demo with simple images" into devel/master

7 years agoMerge "DALi Version 1.2.21" into devel/master
Adeel Kazmi [Fri, 6 Jan 2017 14:18:37 +0000 (06:18 -0800)]
Merge "DALi Version 1.2.21" into devel/master

7 years agoDALi Version 1.2.21 45/109045/1 dali_1.2.21
Agnelo Vaz [Fri, 6 Jan 2017 14:01:30 +0000 (14:01 +0000)]
DALi Version 1.2.21

Change-Id: I48459cf26932dfdc0d897aa487b0944b6957b0af

7 years agoReplaced buffer image generation in dali-demo with simple images 34/109034/3
Adeel Kazmi [Fri, 6 Jan 2017 13:26:35 +0000 (13:26 +0000)]
Replaced buffer image generation in dali-demo with simple images

Distance field buffer images were created every time.
Just outputted this information to a file and loading this instead -> much quicker.

Also removes the need for using BufferImages (deprecated APIs)

Change-Id: Ibdfd17f2798f88f29ad9d66afe68b38853b1b19c

7 years agoKeep c++ flags from environment. 96/108996/1
Francisco Santos [Fri, 6 Jan 2017 11:33:25 +0000 (11:33 +0000)]
Keep c++ flags from environment.

Change-Id: Ia892dcd39c87aa6628d9d7b12120eb0f414c047a

7 years agoAdded an example which shows the automatic clipping feature of controls 02/108502/3
Adeel Kazmi [Wed, 4 Jan 2017 15:30:34 +0000 (15:30 +0000)]
Added an example which shows the automatic clipping feature of controls

Change-Id: I777970b091ded350612e421d147b7b4d3cca0b76

7 years agoAdded more styles to the Progress Bar demo 73/107773/3
Adeel Kazmi [Thu, 29 Dec 2016 17:04:49 +0000 (17:04 +0000)]
Added more styles to the Progress Bar demo

Change-Id: I0de3cca8635ffa51befcb3420a00769b49fd472d

7 years agoDALi Version 1.2.20 dali_1.2.20
Adeel Kazmi [Fri, 30 Dec 2016 10:46:06 +0000 (10:46 +0000)]
DALi Version 1.2.20

Change-Id: I0af24652e21f05d456d978193e1bf144915c8574

7 years agoAdded a tooltip example 90/106890/5
Adeel Kazmi [Fri, 23 Dec 2016 10:41:29 +0000 (10:41 +0000)]
Added a tooltip example

Change-Id: I5909a67d2bff74f23c758862198df4da1e6c4627

7 years agoMerge "(Visual Transitions) Ensure all parameters are initialized in the constructor...
Adeel Kazmi [Fri, 16 Dec 2016 15:06:08 +0000 (07:06 -0800)]
Merge "(Visual Transitions) Ensure all parameters are initialized in the constructor" into devel/master

7 years agoMerge "Added Animated Gif example" into devel/master
Adeel Kazmi [Fri, 16 Dec 2016 13:58:03 +0000 (05:58 -0800)]
Merge "Added Animated Gif example" into devel/master

7 years ago(Visual Transitions) Ensure all parameters are initialized in the constructor 63/105463/1
Adeel Kazmi [Fri, 16 Dec 2016 13:40:16 +0000 (13:40 +0000)]
(Visual Transitions) Ensure all parameters are initialized in the constructor

Change-Id: I7ce54d7bee33741b634bb51a5653b4a08e0958bc

7 years agoDALi Version 1.2.19 47/105447/1 dali_1.2.19
Francisco Santos [Fri, 16 Dec 2016 13:20:03 +0000 (13:20 +0000)]
DALi Version 1.2.19

Change-Id: Ifc3362f5bc68a6a8031d2e250cb90f86a0748bf3

7 years agoAdded Animated Gif example 97/104597/5
Xiangyin Ma [Tue, 13 Dec 2016 18:09:30 +0000 (18:09 +0000)]
Added Animated Gif example

Change-Id: I609238663f1ecd1d7925d5388f25e43c7094a294

7 years agoMerge "Custom control transform animation" into devel/master
Adeel Kazmi [Thu, 15 Dec 2016 16:01:55 +0000 (08:01 -0800)]
Merge "Custom control transform animation" into devel/master

7 years agoCustom control transform animation 19/104919/3
David Steele [Tue, 13 Dec 2016 14:54:58 +0000 (14:54 +0000)]
Custom control transform animation

Added a new demo (transitions.example) that shows off animating
transform properties on a visual.

Change-Id: Ic333241f6618dcaf274d0e2ac399e0e5f3ed2a61

7 years agoChange sibbling order of buttons in svg example 20/104920/1
Agnelo Vaz [Wed, 14 Dec 2016 17:58:26 +0000 (17:58 +0000)]
Change sibbling order of buttons in svg example

Change-Id: I93398c5ff1f7dcdd4820cf90ebc11e81fee0fa05

7 years agoPopup buttons made larger to fit text with default point size 05/104205/2
Agnelo Vaz [Mon, 12 Dec 2016 16:18:17 +0000 (16:18 +0000)]
Popup buttons made larger to fit text with default point size

Change-Id: Ib478ca1d24461e6203810429d615af32973b4ef4

7 years agoImageview svg demo to have offset from top of screen 64/103564/3
Agnelo Vaz [Thu, 8 Dec 2016 15:35:04 +0000 (15:35 +0000)]
Imageview svg demo to have offset from top of screen

Styling demo style sheet updates

Change-Id: Id5addc0be74c387b66b9db1132b4429c6a8af4ed

7 years agoUpdating mesh example to work with button upgrade 49/103549/2
Agnelo Vaz [Thu, 8 Dec 2016 15:04:38 +0000 (15:04 +0000)]
Updating mesh example to work with button upgrade

Change-Id: Iddf64b834aec8b5c75317c7dac78404f19346236

7 years agoDALi Version 1.2.18 40/103840/1 dali_1.2.18
Ferran Sole [Fri, 9 Dec 2016 14:35:17 +0000 (14:35 +0000)]
DALi Version 1.2.18

Change-Id: If67b4c290de75d637b0aee8c95b29c197f4eb4ca

7 years agoUpdate the homescreen benchmark to use text visuals. 01/97201/5
Victor Cebollada [Thu, 10 Nov 2016 17:31:46 +0000 (17:31 +0000)]
Update the homescreen benchmark to use text visuals.

Change-Id: I155be5a4dda65b3d8886d30961857f0f9743d592
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
7 years agoDALi Version 1.2.17 80/101980/1 dali_1.2.17
adam.b [Fri, 2 Dec 2016 14:07:53 +0000 (14:07 +0000)]
DALi Version 1.2.17

Change-Id: Ic8e5e8e887553af9317bdc53014c7b9c36b31086

7 years agoRemove DALi Toy as it no longer compiles & refs to ShaderEffect 09/101609/1
Adeel Kazmi [Thu, 1 Dec 2016 15:21:11 +0000 (15:21 +0000)]
Remove DALi Toy as it no longer compiles & refs to ShaderEffect

Change-Id: I650cb43c8a5ad685f62422f5b1977f8dec5e4033

7 years agoMerge "Changes following Allow background property to be set as a URL string" into...
Adeel Kazmi [Wed, 30 Nov 2016 13:56:44 +0000 (05:56 -0800)]
Merge "Changes following Allow background property to be set as a URL string" into devel/master

7 years agoRevert public API changes. Handle methods. 85/98185/4
Victor Cebollada [Wed, 16 Nov 2016 10:37:53 +0000 (10:37 +0000)]
Revert public API changes. Handle methods.

* Use the Handle functions from the devel API.

Change-Id: Ia30bc374e573c9e84ac4162339e31bb1e0b38074
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
7 years agoChanges following Allow background property to be set as a URL string 17/100917/1
Kimmo Hoikka [Tue, 29 Nov 2016 16:52:31 +0000 (16:52 +0000)]
Changes following Allow background property to be set as a URL string

Change-Id: Ia5f1554df7b053252e4185abda89d7dedc3d0d98

7 years agoChanges following "Changed bubble effect to use new texture API" 95/99995/10
Ferran Sole [Thu, 24 Nov 2016 15:43:22 +0000 (15:43 +0000)]
Changes following "Changed bubble effect to use new texture API"

Change-Id: I1e329a43d1d6026bdfe41facd67d8228561ae713

7 years agofixed a svace error 82/100282/1
adam.b [Fri, 25 Nov 2016 14:19:51 +0000 (14:19 +0000)]
fixed a svace error

Change-Id: I9a89e885e2ea1f239319b38c784441c2ea586cfa

7 years agoMerge "Revert public API changes. BATCH property." into devel/master
Adeel Kazmi [Fri, 25 Nov 2016 13:51:38 +0000 (05:51 -0800)]
Merge "Revert public API changes. BATCH property." into devel/master

7 years agoMerge "Add Flexbox demo to the DALI demo launcher" into devel/master
Adeel Kazmi [Fri, 25 Nov 2016 11:14:32 +0000 (03:14 -0800)]
Merge "Add Flexbox demo to the DALI demo launcher" into devel/master

7 years agoRevert public API changes. BATCH property. 15/98115/5
Victor Cebollada [Wed, 16 Nov 2016 07:05:02 +0000 (07:05 +0000)]
Revert public API changes. BATCH property.

* Use the BATCH property from the devel API.

Change-Id: Ic61771c4c27f08257c5d2619a38ca3c7f8524c1c
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
7 years agoDALi Version 1.2.16 41/100141/1 dali_1.2.16
Victor Cebollada [Fri, 25 Nov 2016 07:07:05 +0000 (07:07 +0000)]
DALi Version 1.2.16

Change-Id: Iaa6a15d66618d2726646425964ef608ebcec144f

7 years agoAdd Flexbox demo to the DALI demo launcher 92/99992/3
Richard Huang [Thu, 24 Nov 2016 15:36:54 +0000 (15:36 +0000)]
Add Flexbox demo to the DALI demo launcher

Change-Id: I800e8b95f86d51276c22c802fda754e0a03749e7

7 years agoFixed svace errors and disabled indicator 99/99999/3
adam.b [Thu, 24 Nov 2016 16:23:11 +0000 (16:23 +0000)]
Fixed svace errors and disabled indicator

Change-Id: I0d4ea08dcb13932a8aa7ec21d0b204a2f6f2f791

7 years agoChanges following patch "Visuals - Avoid having 2 devel headers for visual-properties.h" 82/99582/2
Ferran Sole [Wed, 23 Nov 2016 09:31:53 +0000 (09:31 +0000)]
Changes following patch "Visuals - Avoid having 2 devel headers for visual-properties.h"

Change-Id: Ifa99fb377a65b3670da1b4b680aa441a22996bfe

7 years agoAdded a custom style to the popup example 90/99690/2
Adeel Kazmi [Wed, 23 Nov 2016 16:27:27 +0000 (16:27 +0000)]
Added a custom style to the popup example

Change-Id: I60fde090b81f314c68064081effff331c3216128

7 years agoMerge "homescreen benchmark can use buttons" into devel/master
Adeel Kazmi [Wed, 23 Nov 2016 11:15:58 +0000 (03:15 -0800)]
Merge "homescreen benchmark can use buttons" into devel/master

7 years agohomescreen benchmark can use buttons 92/99392/3
Agnelo Vaz [Tue, 22 Nov 2016 16:11:30 +0000 (16:11 +0000)]
homescreen benchmark can use buttons

Added ability for benchmark tool to use checkbox buttons by providing --use-checkbox command line argument

Change-Id: I7ac8c50a3ea594a548b447b3f3b3ec1be6da9bfd

7 years agoExample of First Person 3D game with DALI 56/95556/28
adam.b [Thu, 3 Nov 2016 20:18:03 +0000 (20:18 +0000)]
Example of First Person 3D game with DALI

- Features 3D environment with simple lightmapping
- Multi-touch first person camera control scheme
- Uses free textures on the GPL license ( blendernation )
- Models are custom made
- Tutorial screen made using DALi toolkit controls ( text labels ).
- Uses PicoJSON parser ( https://github.com/kazuho/picojson )

Change-Id: I6e3503608cd22dc63f371132376d475c890a0474

7 years agoDALi Version 1.2.15 29/98729/1 dali_1.2.15
Umar [Fri, 18 Nov 2016 10:58:44 +0000 (10:58 +0000)]
DALi Version 1.2.15

Change-Id: I5136c2c79089ba17749fd9f5672639228e4b8713

7 years agoMerge "Updates for Visual::SetSize removal" into devel/master
Adeel Kazmi [Thu, 17 Nov 2016 12:09:50 +0000 (04:09 -0800)]
Merge "Updates for Visual::SetSize removal" into devel/master

7 years agoMore SVACE fixes 19/98219/1
Adeel Kazmi [Wed, 16 Nov 2016 12:07:31 +0000 (12:07 +0000)]
More SVACE fixes

Change-Id: I340686abda4cca205187157feb2571c86b0878c2

7 years agoUpdates for Visual::SetSize removal 18/98218/1
David Steele [Wed, 16 Nov 2016 11:59:53 +0000 (11:59 +0000)]
Updates for Visual::SetSize removal

Change-Id: I51ffb1db8e8140c67b4b44cf4bb3343a8c23e622
Signed-off-by: David Steele <david.steele@samsung.com>
7 years agoFix various SVACE errors 04/98004/1
Adeel Kazmi [Tue, 15 Nov 2016 15:35:34 +0000 (15:35 +0000)]
Fix various SVACE errors

Change-Id: I2dfed0e2863dfc4eecb3cb86d28968a76ba78836

7 years agoDALi Version 1.2.14 61/97261/1 dali_1.2.14
Adeel Kazmi [Fri, 11 Nov 2016 18:40:33 +0000 (18:40 +0000)]
DALi Version 1.2.14

Change-Id: I4202967328d317cb8e48341be78b499e3a42516d

7 years agoAdded an example which shows a layout containing animating contact cards 66/93766/16
Adeel Kazmi [Tue, 25 Oct 2016 20:36:06 +0000 (21:36 +0100)]
Added an example which shows a layout containing animating contact cards

Change-Id: Ic59f2e05275694ed1730628b9a1ac4950a759e3f

7 years agoRemoved unnecessary SetOnStage for visuals 57/96357/1
David Steele [Tue, 8 Nov 2016 20:15:12 +0000 (20:15 +0000)]
Removed unnecessary SetOnStage for visuals

Change-Id: I21c535e3cef4f68c92917e43d8b8989f27322e25

7 years agoRemoved use of VisualFactory::InitializeVisual 63/96063/1
David Steele [Mon, 7 Nov 2016 13:33:11 +0000 (13:33 +0000)]
Removed use of VisualFactory::InitializeVisual

Styling currently uses InitalizeVisual rather than a CreateVisual and RegisterVisual pair.
We want to eventually remove InitializeVisual, so pre-emptively removing it's use.

Change-Id: I335afadc01060b477dd9420f30b97d3b953c37ea
Signed-off-by: David Steele <david.steele@samsung.com>
7 years agoDALi Version 1.2.13 67/95767/1 dali_1.2.13
Tom Robinson [Fri, 4 Nov 2016 13:15:30 +0000 (13:15 +0000)]
DALi Version 1.2.13

Change-Id: Ia794bccff4f2bc3580f637f3adb7272d1bacadc9

7 years agoRemove incorrect placement actor from the RegisterVisual API 74/94874/1
Kimmo Hoikka [Tue, 1 Nov 2016 18:45:00 +0000 (18:45 +0000)]
Remove incorrect placement actor from the RegisterVisual API

Change-Id: I0eed4a040cb86468fb649a062b6d3f2f2b13dbd1

7 years agoMerge "Update json style files with the new 'fontStyle' format." into devel/master
Paul Wisbey [Tue, 1 Nov 2016 11:50:43 +0000 (04:50 -0700)]
Merge "Update json style files with the new 'fontStyle' format." into devel/master

7 years agoMerge "Fix PageFactory to take in Texture rather than Image" into devel/master
Adeel Kazmi [Fri, 28 Oct 2016 13:21:28 +0000 (06:21 -0700)]
Merge "Fix PageFactory to take in Texture rather than Image" into devel/master

7 years agoDALi Version 1.2.12 68/94368/1 dali_1.2.12
Xiangyin Ma [Fri, 28 Oct 2016 12:18:31 +0000 (13:18 +0100)]
DALi Version 1.2.12

Change-Id: I5b36330fff7f6061ab2b50fe4b769b6321a16c24

7 years agoUpdate json style files with the new 'fontStyle' format. 62/94162/1
Victor Cebollada [Thu, 27 Oct 2016 07:53:34 +0000 (08:53 +0100)]
Update json style files with the new 'fontStyle' format.

* See 'Text - FONT_STYLE and INPUT_FONT_STYLE properties refactor' patch in toolkit.

Change-Id: I2d2312a6ee7acdadc72e2af1ad4875dbc450eaef
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
7 years agoFix PageFactory to take in Texture rather than Image 12/94012/2
Kimmo Hoikka [Wed, 26 Oct 2016 16:55:59 +0000 (17:55 +0100)]
Fix PageFactory to take in Texture rather than Image

- also remove use of Atlas as that is to be removed

Change-Id: I15dcf8dcda37f01e4c669eb044e3e8eb4fcc1a80

7 years agoChanged README to README.md 15/93715/2
Paul Wisbey [Tue, 25 Oct 2016 10:47:40 +0000 (11:47 +0100)]
Changed README to README.md

Change-Id: I5f2679bf6c2b318aeb027b965a448385a7bb2ef0

7 years agoMerge "Added missing Finnish localization for animated shape demo" into devel/master
Paul Wisbey [Fri, 21 Oct 2016 15:34:10 +0000 (08:34 -0700)]
Merge "Added missing Finnish localization for animated shape demo" into devel/master

7 years agoMerge "DALi Version 1.2.11" into devel/master
Adeel Kazmi [Fri, 21 Oct 2016 14:14:32 +0000 (07:14 -0700)]
Merge "DALi Version 1.2.11" into devel/master

7 years agoDALi Version 1.2.11 15/93315/1 dali_1.2.11
Nick Holland [Fri, 21 Oct 2016 14:09:13 +0000 (15:09 +0100)]
DALi Version 1.2.11

Change-Id: I10887dcbb8e26c52118c1c21b1717a4d99216812

7 years agoAdded a stylable transition to styling example. 48/92348/8
David Steele [Fri, 14 Oct 2016 14:30:50 +0000 (15:30 +0100)]
Added a stylable transition to styling example.

Added Enable / Disable transitions to ImageChannelControl which
can be set via the style sheet.

Added a Visibility attribute to ImageChannelControl which
forces the enable / disable transition to be executed when
the visibility changes.

Added 3 different transitions to the style sheet:
1) a cross fade
2) a longer cross fade
3) a scale change.

Change-Id: I82a1f0e4e4c89ae0bdcb1c59ce01a0a918f17afd
Signed-off-by: David Steele <david.steele@samsung.com>
7 years agoAdded missing Finnish localization for animated shape demo 08/92808/1
Kimmo Hoikka [Tue, 18 Oct 2016 15:53:20 +0000 (16:53 +0100)]
Added missing Finnish localization for animated shape demo

Change-Id: I77885a3d1555c8b7403c3f18a4ea30061d198927

7 years agoDALi Version 1.2.10 31/92331/1 dali_1.2.10
Richard Huang [Fri, 14 Oct 2016 13:17:10 +0000 (14:17 +0100)]
DALi Version 1.2.10

Change-Id: I11b5fd2dc891f4e59f2f8d4231d85a9876bff2af

7 years agoBuilder examples to use Navigation View 11/92011/3
Agnelo Vaz [Wed, 12 Oct 2016 13:49:22 +0000 (14:49 +0100)]
Builder examples to use Navigation View

Change-Id: Ie0ef016796a0d37b3935278c2dc0977cb18c1769

7 years ago(Buttons) Ensured check box buttons fill to parent to show the entire text 37/91837/1
Adeel Kazmi [Tue, 11 Oct 2016 18:40:17 +0000 (19:40 +0100)]
(Buttons) Ensured check box buttons fill to parent to show the entire text

Change-Id: I1f4ca14ce8ecb0edda7f296572d58a9965351444

7 years agoDelete the unused header file 21/91821/2
Xiangyin Ma [Tue, 11 Oct 2016 13:27:56 +0000 (14:27 +0100)]
Delete the unused header file

Change-Id: Ib15910e572c4a23a49a3a7df805adea5911a32f3

7 years agoMerge "Replaced gradient image with gradient visual in renderer-stencil.example"...
Adeel Kazmi [Mon, 10 Oct 2016 10:45:33 +0000 (03:45 -0700)]
Merge "Replaced gradient image with gradient visual in renderer-stencil.example" into devel/master

7 years agoMerge "Size negotiation Example only exits if BACK/ESC is unhandled" into devel/master
Kimmo Hoikka [Fri, 7 Oct 2016 16:40:37 +0000 (09:40 -0700)]
Merge "Size negotiation Example only exits if BACK/ESC is unhandled" into devel/master

7 years agoReplaced gradient image with gradient visual in renderer-stencil.example 40/91440/2
Tom Robinson [Fri, 7 Oct 2016 11:21:35 +0000 (12:21 +0100)]
Replaced gradient image with gradient visual in renderer-stencil.example

Change-Id: I395ff7e9f0adf649294ebb913990fdda83ae9fb2

7 years agoMerge "DALi Version 1.2.9" into devel/master
Adeel Kazmi [Fri, 7 Oct 2016 15:38:41 +0000 (08:38 -0700)]
Merge "DALi Version 1.2.9" into devel/master

7 years agoDALi Version 1.2.9 58/91458/1 dali_1.2.9
Ferran Sole [Fri, 7 Oct 2016 15:33:33 +0000 (16:33 +0100)]
DALi Version 1.2.9

Change-Id: I9044f8fcdd0a238d6fe0624cee679c3d6214d814

7 years agoMerge "Remove custom shader from video view example and change video file sample...
taeyoon [Fri, 7 Oct 2016 04:39:37 +0000 (21:39 -0700)]
Merge "Remove custom shader from video view example and change video file sample" into devel/master

7 years agoSize negotiation Example only exits if BACK/ESC is unhandled 08/91308/3
Adeel Kazmi [Thu, 6 Oct 2016 18:36:53 +0000 (19:36 +0100)]
Size negotiation Example only exits if BACK/ESC is unhandled

Change-Id: Ia11d6ba26ef654ca6c531a169223bc27b4d86e58