projects / platform / core / uifw / dali-demo.git / log
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
platform/core/uifw/dali-demo.git
6 years agoMerge branch 'devel/master' into tizen 07/133607/1 accepted/tizen/unified/20170614.141239 submit/tizen/20170613.061944 submit/tizen/20170614.120205
commit | commitdiff | tree
Seoyeon Kim [Tue, 13 Jun 2017 02:12:56 +0000 (11:12 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: I12c4d05cce521dcd28fa17e25f4fa540262564ea

6 years agoAdded example of actor depth order change 93/132993/3
commit | commitdiff | tree
David Steele [Thu, 8 Jun 2017 15:47:47 +0000 (16:47 +0100)]
Added example of actor depth order change

Fixed up SVG example to ensure actor sibling order is set after
adding to the stage.

Change-Id: Ib532eba27be23afd636e34cc9776ae4fd2c5ca48

6 years agoMerge "Added example of CPU based image masking" into devel/master
commit | commitdiff | tree
Adeel Kazmi [Fri, 9 Jun 2017 12:54:04 +0000 (12:54 +0000)]
Merge "Added example of CPU based image masking" into devel/master

6 years agoDALi Version 1.2.43 87/133287/1 dali_1.2.43
commit | commitdiff | tree
Richard Huang [Fri, 9 Jun 2017 12:23:38 +0000 (13:23 +0100)]
DALi Version 1.2.43

Change-Id: Ibf7d9b70eee75dbdf78b67c5b2fa515f2f887713

6 years agoAdded example of CPU based image masking 36/132536/4
commit | commitdiff | tree
David Steele [Tue, 6 Jun 2017 18:08:01 +0000 (19:08 +0100)]
Added example of CPU based image masking

Change-Id: I908dff83e3140113ba108d660e903f75fd4e4dc1
Signed-off-by: David Steele <david.steele@samsung.com>
6 years agoMerge "Update example to show how to style TextEditor ScrollBar" into devel/master
commit | commitdiff | tree
minho.sun [Thu, 8 Jun 2017 14:31:52 +0000 (14:31 +0000)]
Merge "Update example to show how to style TextEditor ScrollBar" into devel/master

6 years agoAmharic language using the Ge'ez script added to the text-label multi-language demo. 88/129488/2
commit | commitdiff | tree
Victor Cebollada [Tue, 16 May 2017 13:46:28 +0000 (14:46 +0100)]
Amharic language using the Ge'ez script added to the text-label multi-language demo.

Change-Id: Ibcb1a7fa097ffd8fbf45fd300a318b1006909bc2
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
6 years agoMerge branch 'devel/master' into tizen 61/132661/1 accepted/tizen/unified/20170608.072244 submit/tizen/20170607.061735
commit | commitdiff | tree
minho.sun [Wed, 7 Jun 2017 03:15:18 +0000 (12:15 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: I8da619e6557a2bdb0f9e9dfd276164d1bf335640

6 years agoUpdate example to show how to style TextEditor ScrollBar 90/131990/3
commit | commitdiff | tree
minho.sun [Wed, 31 May 2017 12:12:01 +0000 (21:12 +0900)]
Update example to show how to style TextEditor ScrollBar

Update example to show how to style TextEditor ScrollBar

Change-Id: I62ebf0035490dff2c26f7e7c4df095bd2bc93345
Signed-off-by: minho.sun <minho.sun@samsung.com>
6 years agoChanges after Visual Depth Index API changed from float to int 08/132508/1
commit | commitdiff | tree
Adeel Kazmi [Tue, 6 Jun 2017 09:59:35 +0000 (10:59 +0100)]
Changes after Visual Depth Index API changed from float to int

Change-Id: Ib83c1baedd1b5489bbb1fb94bef8c9c64b2df26f

6 years agoUsing new Devel API with depth index to register visuals 85/132485/1
commit | commitdiff | tree
Adeel Kazmi [Mon, 5 Jun 2017 15:47:20 +0000 (16:47 +0100)]
Using new Devel API with depth index to register visuals

Change-Id: I0a763c685579514190af214572c1082a64264fa5

6 years agoChanges required after Visual parent-origin & anchor-point defaults change 54/132354/2
commit | commitdiff | tree
Adeel Kazmi [Fri, 2 Jun 2017 11:10:57 +0000 (12:10 +0100)]
Changes required after Visual parent-origin & anchor-point defaults change

Change-Id: Ia9ba3566e226a73c2ccdc5716e6d64c638bbfc1b

6 years agoMerge "DALi Version 1.2.42" into devel/master
commit | commitdiff | tree
Adeel Kazmi [Fri, 2 Jun 2017 14:14:04 +0000 (14:14 +0000)]
Merge "DALi Version 1.2.42" into devel/master

6 years agoDALi Version 1.2.42 60/132360/1 dali_1.2.42
commit | commitdiff | tree
Nick Holland [Fri, 2 Jun 2017 11:56:07 +0000 (12:56 +0100)]
DALi Version 1.2.42

Change-Id: I8e1f60ce8b6ef03df50806a092e56571d81d113f

6 years ago(Text Scrolling) Change horizontal alignment and ensure auto scrolling still works 15/132015/3
commit | commitdiff | tree
Adeel Kazmi [Wed, 31 May 2017 18:11:20 +0000 (19:11 +0100)]
(Text Scrolling) Change horizontal alignment and ensure auto scrolling still works

Change-Id: I1bc61348536ddc1100b0c991fe5157a7b5c32bd7

6 years agoMerge "Fix the broken popup layout in text field example" into devel/master
commit | commitdiff | tree
Paul Wisbey [Wed, 31 May 2017 16:42:16 +0000 (16:42 +0000)]
Merge "Fix the broken popup layout in text field example" into devel/master

6 years agoSkybox rendering example 83/131683/6
commit | commitdiff | tree
Victor Cebollada [Mon, 29 May 2017 15:39:23 +0000 (16:39 +0100)]
Skybox rendering example

Change-Id: I1b2fa79708f93836069ed81a0d4c17c6aeb6094d

6 years agoFix the broken popup layout in text field example 67/131967/1
commit | commitdiff | tree
Richard Huang [Wed, 31 May 2017 10:20:11 +0000 (11:20 +0100)]
Fix the broken popup layout in text field example

Change-Id: Iae77e4024da2c0668265f50f444b95e047908425

6 years agoMerge branch 'devel/master' into tizen 82/131882/1
commit | commitdiff | tree
Jinho, Lee [Wed, 31 May 2017 02:30:55 +0000 (11:30 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: Icc197125023ac54a46648fbc6acbdd9858a9e743

6 years agoRevert "[Tizen] Fixed install error" 64/131764/1
commit | commitdiff | tree
Jinho, Lee [Tue, 30 May 2017 11:27:51 +0000 (20:27 +0900)]
Revert "[Tizen] Fixed install error"

This reverts commit 26b66dbc390c497dd7f43236b37c8b362e547a34.

Change-Id: I043b8aec230ff64ccf37456e85fbca2c60efb96a

6 years agoRevert "[Tizen] Use Handle::GetCurrentProperty instead of Devel API" 63/131763/1
commit | commitdiff | tree
Jinho, Lee [Tue, 30 May 2017 11:27:05 +0000 (20:27 +0900)]
Revert "[Tizen] Use Handle::GetCurrentProperty instead of Devel API"

This reverts commit 114be157fb6cb98020c81b541de9da824ee89371.

Change-Id: I18fd0f5beb5c7707b1077a81266a46569bba264f

6 years agoChanges required after Visual related Control APIs moved to Devel API 77/131177/2
commit | commitdiff | tree
Adeel Kazmi [Thu, 25 May 2017 17:35:53 +0000 (18:35 +0100)]
Changes required after Visual related Control APIs moved to Devel API

Change-Id: Ie1172a02636929b88e11a8c2683f6ef5092cb55a

6 years agoDALi Version 1.2.41 47/131347/1 dali_1.2.41
commit | commitdiff | tree
greynaga [Fri, 26 May 2017 12:31:13 +0000 (13:31 +0100)]
DALi Version 1.2.41

Change-Id: I31b281ebcd6363156f8ee0bc30b1b34446b61b18

6 years agoMerge "Use Handle::GetCurrentProperty instead of Devel API" into devel/master
commit | commitdiff | tree
Adeel Kazmi [Wed, 24 May 2017 10:14:20 +0000 (10:14 +0000)]
Merge "Use Handle::GetCurrentProperty instead of Devel API" into devel/master

6 years agoMerge "Improved NativeImageSource example" into devel/master
commit | commitdiff | tree
Adeel Kazmi [Mon, 22 May 2017 11:08:48 +0000 (11:08 +0000)]
Merge "Improved NativeImageSource example" into devel/master

6 years ago[Tizen] Use Handle::GetCurrentProperty instead of Devel API 89/130389/1 accepted/tizen/unified/20170523.050803 submit/tizen/20170522.141510 tizen_4.0.m1_release
commit | commitdiff | tree
minho.sun [Mon, 22 May 2017 06:22:21 +0000 (15:22 +0900)]
[Tizen] Use Handle::GetCurrentProperty instead of Devel API

DevelHandle::GetCurrentProperty is moved to public.
So, use Handle::GetCurrentProperty instead of devel.

Change-Id: Id9058646e3502b756c81a1117872cd5fd08a8d51
Signed-off-by: minho.sun <minho.sun@samsung.com>
6 years agoUse Handle::GetCurrentProperty instead of Devel API 61/130361/2
commit | commitdiff | tree
minho.sun [Mon, 22 May 2017 06:22:21 +0000 (15:22 +0900)]
Use Handle::GetCurrentProperty instead of Devel API

DevelHandle::GetCurrentProperty is moved to public.
So, use Handle::GetCurrentProperty instead of devel.

Change-Id: I9747e0b068ff907b8488d814f08769cf89f2e84e
Signed-off-by: minho.sun <minho.sun@samsung.com>
6 years agoDALi Version 1.2.40 28/130228/1 dali_1.2.40
commit | commitdiff | tree
Francisco Santos [Fri, 19 May 2017 12:43:49 +0000 (13:43 +0100)]
DALi Version 1.2.40

Change-Id: I675fcdf6232d811bf08ff2a2e0ddc692b68b322f

6 years agoImproved NativeImageSource example 76/129976/4
commit | commitdiff | tree
Paul Wisbey [Thu, 18 May 2017 15:49:08 +0000 (16:49 +0100)]
Improved NativeImageSource example

Change-Id: I6b4629923ff9d20b48a0ba0b07369bea00900bfb

6 years agoFix demo installation break 46/129946/1
commit | commitdiff | tree
Adeel Kazmi [Thu, 18 May 2017 11:59:06 +0000 (12:59 +0100)]
Fix demo installation break

Change-Id: Ie9609827834e05cb010eda842b415186f80989da

6 years ago[Tizen] Fixed install error 69/129469/1 accepted/tizen/unified/20170518.061136 accepted/tizen/unified/20170518.061203 submit/tizen/20170517.061745 submit/tizen/20170517.083100
commit | commitdiff | tree
taeyoon0.lee [Tue, 16 May 2017 12:08:04 +0000 (21:08 +0900)]
[Tizen] Fixed install error

Change-Id: If56c4d185d684e15e855f78c1a84943fca962398

6 years agoMerge branch 'devel/master (1.2.39+)' into tizen 60/129460/1
commit | commitdiff | tree
taeyoon0.lee [Tue, 16 May 2017 11:38:54 +0000 (20:38 +0900)]
Merge branch 'devel/master (1.2.39+)' into tizen

Change-Id: I1af4dd2b90784313c54af4cb4a6a4075b9ff536b

6 years agoMerge "DALi ray marching / ray tracing example" into devel/master
commit | commitdiff | tree
Adeel Kazmi [Fri, 12 May 2017 18:24:28 +0000 (18:24 +0000)]
Merge "DALi ray marching / ray tracing example" into devel/master

6 years agoMerge "Text scrolling example use scrolling stop mode(FINISH_LOOP, IMMEDIATE) and...
commit | commitdiff | tree
Adeel Kazmi [Fri, 12 May 2017 15:19:33 +0000 (15:19 +0000)]
Merge "Text scrolling example use scrolling stop mode(FINISH_LOOP, IMMEDIATE) and loop delay" into devel/master

6 years agoDALi ray marching / ray tracing example 00/127500/8
commit | commitdiff | tree
Nick Holland [Thu, 27 Apr 2017 12:23:33 +0000 (13:23 +0100)]
DALi ray marching / ray tracing example

Uses volumetric ray casting to draw a sphere with basic
per-pixel lighting inside the fragment shader.

Also modifies DALi demo make file to support shader files.

Change-Id: I0645de8481fa75abb177ca76a5611a51350fc1b7
Todo: Create a separate folder for shaders?

6 years agoDALi Version 1.2.39 45/129045/1 dali_1.2.39
commit | commitdiff | tree
David Steele [Fri, 12 May 2017 12:42:43 +0000 (13:42 +0100)]
DALi Version 1.2.39

Change-Id: Ia7981fd8b3778a9f2d069c8456e0bf36b7dc9b16

6 years agoText scrolling example use scrolling stop mode(FINISH_LOOP, IMMEDIATE) and loop delay 49/126149/12
commit | commitdiff | tree
Jinho, Lee [Thu, 20 Apr 2017 06:59:35 +0000 (15:59 +0900)]
Text scrolling example use scrolling stop mode(FINISH_LOOP, IMMEDIATE) and loop delay

Change-Id: I991ccd799fd33bcfcf9ebfd392c0b429065996cb

6 years agoRevert "[Tizen] Use old ABI temporarily" 65/128865/1 accepted/tizen/unified/20170512.023900 submit/tizen/20170512.005333 submit/tizen/20170512.014117
commit | commitdiff | tree
Heeyong Song [Fri, 12 May 2017 00:45:26 +0000 (09:45 +0900)]
Revert "[Tizen] Use old ABI temporarily"

This reverts commit c57a9ff8c7c796631c243a3e674b3821213ebaeb.

Change-Id: Ibff6eb4fd6961e22ae41fd170b449c0e903b40cc

6 years ago[Tizen] Use old ABI temporarily 99/128199/1 accepted/tizen/unified/20170510.013040 submit/tizen/20170508.091210
commit | commitdiff | tree
Heeyong Song [Mon, 8 May 2017 04:15:07 +0000 (13:15 +0900)]
[Tizen] Use old ABI temporarily

Change-Id: I6dd331af28d75448beee073b4a91a8cc8bf078af

6 years agoMerge branch 'devel/master' into tizen 98/128198/1
commit | commitdiff | tree
Heeyong Song [Mon, 8 May 2017 04:14:40 +0000 (13:14 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: I0975d086de1558c523667665c9dff82af6af1908

6 years agoRevert "[Tizen] Use old ABI temporarily" 97/128197/1
commit | commitdiff | tree
Heeyong Song [Mon, 8 May 2017 04:13:59 +0000 (13:13 +0900)]
Revert "[Tizen] Use old ABI temporarily"

This reverts commit 749bad0ac62db024ecc4c50aca7893724737f9c5.

Change-Id: I4ec349cda5b45d71f87e9639d44b5338dbbab858

6 years agoDALi Version 1.2.38 92/128092/1 dali_1.2.38
commit | commitdiff | tree
Agnelo Vaz [Fri, 5 May 2017 09:52:31 +0000 (10:52 +0100)]
DALi Version 1.2.38

Change-Id: I27a5ead04d90b4009f1f0012a217e5710cc2daa6

6 years agoRendering API example: basic light 47/127747/12
commit | commitdiff | tree
Gonzalo Reynaga [Fri, 28 Apr 2017 12:55:07 +0000 (13:55 +0100)]
Rendering API example: basic light

Change-Id: Ice5ef50aa0bde7ddac16414dfac8615d76d9ec18

6 years ago[Tizen] Use old ABI temporarily 33/127833/1 accepted/tizen/unified/20170502.165634 submit/tizen/20170502.061218
commit | commitdiff | tree
Seoyeon Kim [Tue, 2 May 2017 02:11:45 +0000 (11:11 +0900)]
[Tizen] Use old ABI temporarily

This reverts commit 0656b3f520715c76d3f064cd294343a7841cedd9.

Change-Id: I558e644b0051dcb808276be62b5960512c1490fd

6 years agoMerge branch 'devel/master' into tizen 32/127832/1
commit | commitdiff | tree
Seoyeon Kim [Tue, 2 May 2017 02:10:56 +0000 (11:10 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: Ic64edf62a115136a5bb387f0eb7c8be8c6040ad3

6 years agoRevert "[Tizen] Use old ABI temporarily" 31/127831/1
commit | commitdiff | tree
Seoyeon Kim [Tue, 2 May 2017 02:09:47 +0000 (11:09 +0900)]
Revert "[Tizen] Use old ABI temporarily"

This reverts commit af0f96ee6b16c2aa7742680cacd0cb56c7171a25.

Change-Id: I78e3695d525d2a7b52f9317ff202ac0f43a4489d

6 years agoDALi Version 1.2.37 15/127715/1 dali_1.2.37
commit | commitdiff | tree
Adeel Kazmi [Fri, 28 Apr 2017 10:33:03 +0000 (11:33 +0100)]
DALi Version 1.2.37

Change-Id: I959d02c918463b8758c0c551940ad6b7cda34e49

6 years ago[Tizen] Use old ABI temporarily 44/126844/1 accepted/tizen/unified/20170426.061758 submit/tizen/20170425.094140 submit/tizen/20170425.110915
commit | commitdiff | tree
taeyoon0.lee [Tue, 25 Apr 2017 06:46:22 +0000 (15:46 +0900)]
[Tizen] Use old ABI temporarily

This reverts commit 0a30a93832e076af078caa186ce4a42cbc324316.

Change-Id: I178c6d0b60dd4c25988b2dde9b6bef59f161df8c

6 years agoMerge branch 'devel/master (1.2.36+)' into tizen 43/126843/1
commit | commitdiff | tree
taeyoon0.lee [Tue, 25 Apr 2017 06:45:35 +0000 (15:45 +0900)]
Merge branch 'devel/master (1.2.36+)' into tizen

Change-Id: I8d542cf5fd6b5638273e917e123d25c87140b981

6 years agoRevert "[Tizen] Changed RENDERING_TYPE to renderingType for video view" 42/126842/1
commit | commitdiff | tree
taeyoon0.lee [Tue, 25 Apr 2017 06:44:57 +0000 (15:44 +0900)]
Revert "[Tizen] Changed RENDERING_TYPE to renderingType for video view"

This reverts commit fcb1eb473bf3d5bcc5dfa63d69dae31ee2c8e334.

Change-Id: Iad3f8665923f9b015f02fa68973eac40be820c9c

6 years agoRevert "[Tizen] Use old ABI temporarily" 41/126841/1
commit | commitdiff | tree
taeyoon0.lee [Tue, 25 Apr 2017 06:44:26 +0000 (15:44 +0900)]
Revert "[Tizen] Use old ABI temporarily"

This reverts commit 2bac295c04b88131ec190139470f47afed7d41c4.

Change-Id: Ie0bc9accc669040a90526750ec953bf421a966bb

6 years ago[Tizen] Use old ABI temporarily 08/126508/1 submit/tizen/20170424.093438
commit | commitdiff | tree
Heeyong Song [Mon, 24 Apr 2017 02:20:29 +0000 (11:20 +0900)]
[Tizen] Use old ABI temporarily

Change-Id: Ie4e14005f3587cfaa6828d49a9d7867b11f26b64

7 years agoMerge "Changes after Set/Get synchronous behaviour of registered animatable & custom...
commit | commitdiff | tree
David Steele [Fri, 21 Apr 2017 12:34:20 +0000 (05:34 -0700)]
Merge "Changes after Set/Get synchronous behaviour of registered animatable & custom properties" into devel/master

7 years agoMerge "DALi Version 1.2.36" into devel/master
commit | commitdiff | tree
Adeel Kazmi [Fri, 21 Apr 2017 11:38:46 +0000 (04:38 -0700)]
Merge "DALi Version 1.2.36" into devel/master

7 years agoDALi Version 1.2.36 47/126447/1 dali_1.2.36
commit | commitdiff | tree
adam.b [Fri, 21 Apr 2017 11:29:40 +0000 (12:29 +0100)]
DALi Version 1.2.36

Change-Id: I70ba243b0e818d39eb58477f15a9c169ed369997

7 years agoChanges after Set/Get synchronous behaviour of registered animatable & custom properties 70/124470/2
commit | commitdiff | tree
Adeel Kazmi [Tue, 11 Apr 2017 10:14:29 +0000 (11:14 +0100)]
Changes after Set/Get synchronous behaviour of registered animatable & custom properties

Change-Id: Icee24bd6eedfb1764513c763393bd2a9a2853341

7 years ago[Tizen] Changed RENDERING_TYPE to renderingType for video view 57/125857/1
commit | commitdiff | tree
taeyoon0.lee [Wed, 19 Apr 2017 04:36:14 +0000 (13:36 +0900)]
[Tizen] Changed RENDERING_TYPE to renderingType for video view

Change-Id: I8b12cd759774e790c8e1abfc3c65c8d3708e7d70

7 years agoChanged RENDERING_TYPE to renderingType for video view 17/125817/1
commit | commitdiff | tree
taeyoon0.lee [Wed, 19 Apr 2017 04:36:14 +0000 (13:36 +0900)]
Changed RENDERING_TYPE to renderingType for video view

Change-Id: I8b12cd759774e790c8e1abfc3c65c8d3708e7d70

7 years agoMerge branch 'devel/master' into tizen 11/125411/1 accepted/tizen/unified/20170418.072447 submit/tizen/20170417.100748
commit | commitdiff | tree
Jinho, Lee [Mon, 17 Apr 2017 07:56:42 +0000 (16:56 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: I0a9f37f406f8ffdeba1fcd594fa46211f8583844

7 years agoDALi Version 1.2.35 97/124997/1 dali_1.2.35
commit | commitdiff | tree
Umar [Thu, 13 Apr 2017 09:10:31 +0000 (10:10 +0100)]
DALi Version 1.2.35

Change-Id: Ic0964483674ddc18950f2c753507a88b32a9c710

7 years agoMerge branch 'devel/master' into tizen 35/124035/1 accepted/tizen/unified/20170410.160011 submit/tizen/20170410.071852
commit | commitdiff | tree
minho.sun [Mon, 10 Apr 2017 03:32:29 +0000 (12:32 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: I435d9578cbf191b7e79dcdb43487931a8d44a190

7 years agoMerge "DALi Version 1.2.34" into devel/master
commit | commitdiff | tree
Adeel Kazmi [Fri, 7 Apr 2017 10:58:13 +0000 (03:58 -0700)]
Merge "DALi Version 1.2.34" into devel/master

7 years agoDALi Version 1.2.34 95/123895/1 dali_1.2.34
commit | commitdiff | tree
Nick Holland [Fri, 7 Apr 2017 10:11:21 +0000 (11:11 +0100)]
DALi Version 1.2.34

Change-Id: I258733584f2da7cf20b32351ec99888cd04428b4

7 years agoRemove UnhandledKeyEventSignal from examples. 14/123714/2
commit | commitdiff | tree
minho.sun [Thu, 6 Apr 2017 16:34:58 +0000 (01:34 +0900)]
Remove UnhandledKeyEventSignal from examples.

UnhandledKeyEventSignal is removed from KeyInputFocusManager.
Stage::KeyEventSignal can work as UnhandledKeyEventSignal.

Change-Id: I264c4fdd7aafcc668ba64bf8fe5abafed5103430
Signed-off-by: minho.sun <minho.sun@samsung.com>
7 years agoRendering of radial progress indicator 49/123149/4
commit | commitdiff | tree
adam.b [Fri, 10 Mar 2017 11:40:09 +0000 (11:40 +0000)]
Rendering of radial progress indicator

Tutorial shows rendering of radial progress bar with
use of stencil buffer and two renderers attached
to single actor.

Change-Id: Ia1005524ec3cd27147bb2a40ddf87c7284ad7731

7 years agoTutorials added to the xml file 48/121748/3
commit | commitdiff | tree
adam.b [Tue, 28 Mar 2017 17:25:39 +0000 (18:25 +0100)]
Tutorials added to the xml file

Change-Id: I6fe21917c21063709d1516c0bcf5d83530908161

7 years agoMerge "DALi Version 1.2.33" into devel/master
commit | commitdiff | tree
Paul Wisbey [Fri, 31 Mar 2017 12:33:26 +0000 (05:33 -0700)]
Merge "DALi Version 1.2.33" into devel/master

7 years agoDALi Version 1.2.33 38/122438/1 dali_1.2.33
commit | commitdiff | tree
Richard Huang [Fri, 31 Mar 2017 09:59:03 +0000 (10:59 +0100)]
DALi Version 1.2.33

Change-Id: I45bfcc74c0169df10333b28db1f584807160467f

7 years agoMerge branch 'devel/master' into tizen 64/122364/1 accepted/tizen_common accepted/tizen_ivi accepted/tizen_mobile accepted/tizen_tv accepted/tizen_wearable accepted/tizen/common/20170403.185636 accepted/tizen/ivi/20170403.022404 accepted/tizen/mobile/20170403.021959 accepted/tizen/tv/20170403.022208 accepted/tizen/unified/20170403.022426 accepted/tizen/wearable/20170403.022318 submit/tizen/20170331.124519
commit | commitdiff | tree
dongsug.song [Fri, 31 Mar 2017 05:57:03 +0000 (14:57 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: If12fb6560b14a3d83693d4135c4e2d3530ccc55e

7 years agoTextScrolling example allows text color changes 21/122221/1
commit | commitdiff | tree
Agnelo Vaz [Thu, 30 Mar 2017 14:19:09 +0000 (15:19 +0100)]
TextScrolling example allows text color changes

Change-Id: I01f2785583486b5c26cee4ae8cfaa9ac1b40bb92

7 years agoMerge branch 'devel/master' into tizen 41/121041/1 accepted/tizen/common/20170327.143227 accepted/tizen/ivi/20170328.060434 accepted/tizen/mobile/20170328.060028 accepted/tizen/tv/20170328.060211 accepted/tizen/unified/20170328.060502 accepted/tizen/wearable/20170328.060344 submit/tizen/20170327.130356
commit | commitdiff | tree
Seoyeon Kim [Mon, 27 Mar 2017 05:59:36 +0000 (14:59 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: Iab9636d4e7113374521306d69d85e1e914f6002c

7 years agoAdd Back key support to examples which do not have it 19/120919/1
commit | commitdiff | tree
Adeel Kazmi [Fri, 24 Mar 2017 18:51:32 +0000 (18:51 +0000)]
Add Back key support to examples which do not have it

Change-Id: Ib36b14b0763130b811ae1f45ce4c631c25d6776c

7 years agoMerge "packaging/com.samsung.dali-demo.spec use license macro" into devel/master
commit | commitdiff | tree
Adeel Kazmi [Fri, 24 Mar 2017 18:33:12 +0000 (11:33 -0700)]
Merge "packaging/com.samsung.dali-demo.spec use license macro" into devel/master

7 years agoDALi Version 1.2.32 73/120873/1 dali_1.2.32
commit | commitdiff | tree
Victor Cebollada [Fri, 24 Mar 2017 11:51:16 +0000 (11:51 +0000)]
DALi Version 1.2.32

Change-Id: I41d8a4a5355359d7df630b24cc04d33db8ad06c9

7 years agopackaging/com.samsung.dali-demo.spec use license macro 64/120764/1
commit | commitdiff | tree
Jinho, Lee [Fri, 24 Mar 2017 04:39:58 +0000 (13:39 +0900)]
packaging/com.samsung.dali-demo.spec use license macro

Change-Id: I2379792074afbfc960e06c1fac71fc37b6f71d56

7 years agoMerge branch 'devel/master (1.2.31)' into tizen 27/119727/1 accepted/tizen/common/20170320.173855 accepted/tizen/common/20170324.123047 accepted/tizen/ivi/20170320.223056 accepted/tizen/ivi/20170324.112153 accepted/tizen/mobile/20170320.222645 accepted/tizen/mobile/20170324.111710 accepted/tizen/tv/20170320.222911 accepted/tizen/tv/20170324.111935 accepted/tizen/unified/20170320.223119 accepted/tizen/unified/20170324.112226 accepted/tizen/wearable/20170320.223013 accepted/tizen/wearable/20170324.112057 submit/tizen/20170320.091401 submit/tizen/20170324.082849
commit | commitdiff | tree
Heeyong Song [Mon, 20 Mar 2017 02:23:16 +0000 (11:23 +0900)]
Merge branch 'devel/master (1.2.31)' into tizen

Change-Id: I642f6a50947051b11977f238a8a8210219a78497

7 years agoMerge "DALi Version 1.2.31" into devel/master
commit | commitdiff | tree
Adeel Kazmi [Fri, 17 Mar 2017 16:22:51 +0000 (09:22 -0700)]
Merge "DALi Version 1.2.31" into devel/master

7 years agoDALi Version 1.2.31 27/119627/1 dali_1.2.31
commit | commitdiff | tree
Francisco Santos [Fri, 17 Mar 2017 16:15:43 +0000 (16:15 +0000)]
DALi Version 1.2.31

Change-Id: If5f42c790c843641cf2ccc5a1d7c3f14bc7145fd

7 years agoUpdates following size and offset policy property changes 97/119397/2
commit | commitdiff | tree
Adeel Kazmi [Thu, 16 Mar 2017 18:35:16 +0000 (18:35 +0000)]
Updates following size and offset policy property changes

Change-Id: I59fbcbdea60da95ec599528fe76b2a227355711c

7 years agoMerge "Fixed launcher for textured-mesh example" into devel/master
commit | commitdiff | tree
Adeel Kazmi [Wed, 15 Mar 2017 16:05:13 +0000 (09:05 -0700)]
Merge "Fixed launcher for textured-mesh example" into devel/master

7 years agoMerge branch 'devel/master (1.2.30)' into tizen 87/118587/1 accepted/tizen/common/20170313.162855 accepted/tizen/ivi/20170314.074908 accepted/tizen/mobile/20170314.074553 accepted/tizen/tv/20170314.074732 accepted/tizen/unified/20170314.074956 accepted/tizen/wearable/20170314.074821 submit/tizen/20170313.134641
commit | commitdiff | tree
taeyoon0.lee [Mon, 13 Mar 2017 08:04:04 +0000 (17:04 +0900)]
Merge branch 'devel/master (1.2.30)' into tizen

Change-Id: I84a52627a7dfb49c3618b994425fef6e865cf8dd

7 years agoMerge "DALi Version 1.2.30" into devel/master
commit | commitdiff | tree
Adeel Kazmi [Fri, 10 Mar 2017 15:05:39 +0000 (07:05 -0800)]
Merge "DALi Version 1.2.30" into devel/master

7 years agoDALi Version 1.2.30 64/118464/1 dali_1.2.30
commit | commitdiff | tree
David Steele [Fri, 10 Mar 2017 15:01:26 +0000 (15:01 +0000)]
DALi Version 1.2.30

Change-Id: I9c3ab63b00d8fb2959032e8626ba732a8a53d3e5

7 years agoFixed launcher for textured-mesh example 98/117098/2
commit | commitdiff | tree
David Steele [Thu, 2 Mar 2017 19:20:00 +0000 (19:20 +0000)]
Fixed launcher for textured-mesh example

Change-Id: I8c5d63694570cb30da7be41aea31dbc5a3be991c
Signed-off-by: David Steele <david.steele@samsung.com>
7 years agoFocus Integration Sample 59/117459/13
commit | commitdiff | tree
minho.sun [Mon, 6 Mar 2017 06:54:47 +0000 (15:54 +0900)]
Focus Integration Sample

You can check the InputFocus is given to focused Control.
After that, when key is pressed, focused control's KeyEvent callback will be called.

Change-Id: I93c605e7bcde5505099948445c762873f57e8381
Signed-off-by: minho.sun <minho.sun@samsung.com>
7 years agoMerge "Example of animating around a pivot" into devel/master
commit | commitdiff | tree
Kimmo Hoikka [Thu, 9 Mar 2017 17:12:52 +0000 (09:12 -0800)]
Merge "Example of animating around a pivot" into devel/master

7 years agoExample of animating around a pivot 72/115872/10
commit | commitdiff | tree
Adeel Kazmi [Tue, 21 Feb 2017 16:57:03 +0000 (16:57 +0000)]
Example of animating around a pivot

Change-Id: I4452b494bb6a3a094787480dd60c38f140d36e20

7 years agoUpdated shadow-button transition demo resources 93/117093/3
commit | commitdiff | tree
David Steele [Thu, 16 Feb 2017 16:46:11 +0000 (16:46 +0000)]
Updated shadow-button transition demo resources

Fixed the sizes and substates for disabling/enabling the shadow
button

Change-Id: I0fff3e76acbde962c0d958881f5e92aa2a8478ff
Signed-off-by: David Steele <david.steele@samsung.com>
7 years agoUpdate demos to not use deprecated Button API 30/117030/3
commit | commitdiff | tree
Agnelo Vaz [Thu, 2 Mar 2017 10:24:03 +0000 (10:24 +0000)]
Update demos to not use deprecated Button API

Change-Id: Iaf8e17feb02567a92f2ff83a050e8bc6652212a0

7 years agoDALi Version 1.2.29 93/117293/1 dali_1.2.29
commit | commitdiff | tree
Agnelo Vaz [Fri, 3 Mar 2017 14:06:22 +0000 (14:06 +0000)]
DALi Version 1.2.29

Change-Id: I2e5b9410bb5b98b4a354d7154624cdc9642de890

7 years agoMerge "A simple control using visuals" into devel/master
commit | commitdiff | tree
Adeel Kazmi [Tue, 28 Feb 2017 13:39:43 +0000 (05:39 -0800)]
Merge "A simple control using visuals" into devel/master

7 years agoA simple control using visuals 73/115873/9
commit | commitdiff | tree
Agnelo Vaz [Tue, 21 Feb 2017 14:10:57 +0000 (14:10 +0000)]
A simple control using visuals

Example code for creating a control using visuals with states defined in the stylesheet

Change-Id: Ief41cfad7c3eeb8d78bd6540db36e4b761b28e5f

7 years agoAdded Rendering tutorials 29/114929/13
commit | commitdiff | tree
adam.b [Wed, 15 Feb 2017 18:00:24 +0000 (18:00 +0000)]
Added Rendering tutorials

- Drawing line
- Drawing triangle
- Drawing colored cube
- Drawing textured cube

Change-Id: Ief3c47871b0f06ba764fa86a260ad8561c78acd3

7 years agoSVACE error, un-intialised variable in example 97/116697/2
commit | commitdiff | tree
Agnelo Vaz [Mon, 27 Feb 2017 16:47:57 +0000 (16:47 +0000)]
SVACE error, un-intialised variable in example

Change-Id: I78dec36ee7609f7beb3202dd77a785644702ce6e

7 years agoRemove redundant call to ResourceImage::GetImageSize() 22/115822/3
commit | commitdiff | tree
Nick Holland [Tue, 21 Feb 2017 10:54:26 +0000 (10:54 +0000)]
Remove redundant call to ResourceImage::GetImageSize()

Change-Id: I6fd663fad743bd52f1667108492cd92c3c150ad3

7 years agoMerge branch 'devel/master' into tizen 46/116546/1 accepted/tizen/common/20170306.164909 accepted/tizen/ivi/20170306.103423 accepted/tizen/mobile/20170306.103133 accepted/tizen/tv/20170306.103237 accepted/tizen/unified/20170309.034501 accepted/tizen/wearable/20170306.103327 submit/tizen/20170227.051047 submit/tizen/20170306.033709 submit/tizen_unified/20170308.100410
commit | commitdiff | tree
suhyung Eom [Mon, 27 Feb 2017 02:21:05 +0000 (11:21 +0900)]
Merge branch 'devel/master' into tizen

Change-Id: Ief09616fa9eb5342c31be091ee0d2f6b055d6dd0

7 years agoRevert "[Tizen] Prepare for Tizen 4.0 Build" 45/116545/1
commit | commitdiff | tree
suhyung Eom [Mon, 27 Feb 2017 02:19:54 +0000 (11:19 +0900)]
Revert "[Tizen] Prepare for Tizen 4.0 Build"

This reverts commit 99797a8cc93a3dd359025b2edb01ce20006395eb.
Change-Id: Ie7ab25cc13667826b7422c163504627c957c9540

7 years agoDALi Version 1.2.28 50/116450/1 dali_1.2.28
commit | commitdiff | tree
Adeel Kazmi [Fri, 24 Feb 2017 09:34:18 +0000 (09:34 +0000)]
DALi Version 1.2.28

Change-Id: I551e0e08ccc3737bf5e48bc19fc4168c29f21b5f

7 years agoMerge "Updated shadow-button transition demo to use states and sub-states" into devel...
commit | commitdiff | tree
Adeel Kazmi [Thu, 23 Feb 2017 19:15:13 +0000 (11:15 -0800)]
Merge "Updated shadow-button transition demo to use states and sub-states" into devel/master

7 years ago(Mesh Visual) Changed the stage colour 12/115612/2
commit | commitdiff | tree
Adeel Kazmi [Mon, 20 Feb 2017 15:49:13 +0000 (15:49 +0000)]
(Mesh Visual) Changed the stage colour

Change-Id: Ia0c00bd55018abeae0d478f33aa33d01bf7dfbdf

next
Domain: Graphics System / DALi;