platform/core/uifw/dali-demo.git
7 years ago[dali_1.2.46] Merge branch 'devel/master' 17/136617/1
Adeel Kazmi [Fri, 30 Jun 2017 10:21:57 +0000 (11:21 +0100)]
[dali_1.2.46] Merge branch 'devel/master'

Change-Id: I1f048dab10a8d45bb116e98a2c2ba3348504fe94

7 years agoDALi Version 1.2.46 12/136612/1 dali_1.2.46
Adeel Kazmi [Fri, 30 Jun 2017 10:21:07 +0000 (11:21 +0100)]
DALi Version 1.2.46

Change-Id: Ibf37c1575bdee99f8dc3cb450d5548be4bf327b7

7 years agoRemoved BitmapLoader references 60/135660/1
David Steele [Fri, 23 Jun 2017 16:02:08 +0000 (17:02 +0100)]
Removed BitmapLoader references

Change-Id: I3b5ef31b0f8655a59c14fbabb1fa98c31699ff3c

7 years ago[dali_1.2.45] Merge branch 'devel/master' 13/135613/1
Victor Cebollada [Fri, 23 Jun 2017 09:45:06 +0000 (10:45 +0100)]
[dali_1.2.45] Merge branch 'devel/master'

Change-Id: I6e00f9c848b395a5428fb021c60b46dc1439ff07

7 years agoDALi Version 1.2.45 09/135609/1 dali_1.2.45
Victor Cebollada [Fri, 23 Jun 2017 09:44:18 +0000 (10:44 +0100)]
DALi Version 1.2.45

Change-Id: I241bf287ab4256031d92c5a61fde8fd292234231

7 years agoMerge "Clipping draw order fix" into devel/master
David Steele [Wed, 21 Jun 2017 12:50:50 +0000 (12:50 +0000)]
Merge "Clipping draw order fix" into devel/master

7 years agoClipping draw order fix 26/135026/1
Tom Robinson [Tue, 20 Jun 2017 10:51:55 +0000 (11:51 +0100)]
Clipping draw order fix

Change-Id: I3c5aa4922e891cf1ca194676d1bcf2e3493c5eb1

7 years agoMeitei string added to TextLabel multilanguage demo. 80/134980/3
Victor Cebollada [Tue, 20 Jun 2017 11:20:13 +0000 (12:20 +0100)]
Meitei string added to TextLabel multilanguage demo.

Change-Id: Ifa382ce7709a4697b8e753123aa9dfe5d724ed11
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
7 years agoOl Chiki string added to TextLabel multilanguage demo. 21/135021/1
Victor Cebollada [Tue, 20 Jun 2017 13:40:57 +0000 (14:40 +0100)]
Ol Chiki string added to TextLabel multilanguage demo.

Change-Id: Ide572bd702a7f137b7ac3b54b7c5669e8c48fd8b
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
7 years agoFix for multilanguage demo. 15/135015/3
Victor Cebollada [Tue, 20 Jun 2017 13:08:54 +0000 (14:08 +0100)]
Fix for multilanguage demo.

* Fix the order of the language's names.
  First the language name written in its language/script,
  then the language name in English.

Change-Id: Ia1d1bf846218395e31f3f076343a592185b8cc9c
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
7 years agoMerge "Added resourceReadySignal to image-scaling-irregular demo" into devel/master
Paul Wisbey [Fri, 16 Jun 2017 14:03:57 +0000 (14:03 +0000)]
Merge "Added resourceReadySignal to image-scaling-irregular demo" into devel/master

7 years ago[dali_1.2.44] Merge branch 'devel/master' 38/134438/1
Umar [Fri, 16 Jun 2017 11:04:40 +0000 (12:04 +0100)]
[dali_1.2.44] Merge branch 'devel/master'

Change-Id: Ia7b8bf4e8970237d4ccae7de8adec71cd348877d

7 years agoDALi Version 1.2.44 34/134434/1 dali_1.2.44
Umar [Fri, 16 Jun 2017 11:03:58 +0000 (12:03 +0100)]
DALi Version 1.2.44

Change-Id: Iaa66dc1f68e713bf44d05d892d7ade3f590f1fc7

7 years agoAdded resourceReadySignal to image-scaling-irregular demo 04/132804/3
Nick Holland [Wed, 7 Jun 2017 15:06:04 +0000 (16:06 +0100)]
Added resourceReadySignal to image-scaling-irregular demo

Demo now waits for first 10 Images to load before loading any
further images to speed up start up time.

Un-earths a bug in TextureObserver which causes a seg fault

Change-Id: Ia389bd3ca322be2dfb37170a5ea40af65dfc23f2

7 years agoPBR demo 55/133255/12
greynaga [Tue, 6 Jun 2017 10:24:25 +0000 (11:24 +0100)]
PBR demo

With separate cameras for UI & 3D scene sections
 - Double-tap to toggle between 3D models (teapot & cube)
 - Pan up/down on left side of screen to change roughness
 - Pan up/down on right side of screen to change metalness
 - Pan anywhere else to rotate scene

Change-Id: I51ec8436700c4e970221184d6875e4e9c501fafb

7 years agoAdded example of actor depth order change 93/132993/3
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

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

7 years ago[dali_1.2.43] Merge branch 'devel/master' 91/133291/2
Adeel Kazmi [Fri, 9 Jun 2017 12:53:36 +0000 (13:53 +0100)]
[dali_1.2.43] Merge branch 'devel/master'

Change-Id: I25f44c4135a2a802f3d5f713a52301e17e4b48b4

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

Change-Id: Ibf7d9b70eee75dbdf78b67c5b2fa515f2f887713

7 years agoAdded example of CPU based image masking 36/132536/4
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>
7 years agoMerge "Update example to show how to style TextEditor ScrollBar" into devel/master
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

7 years agoAmharic language using the Ge'ez script added to the text-label multi-language demo. 88/129488/2
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>
7 years agoUpdate example to show how to style TextEditor ScrollBar 90/131990/3
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>
7 years agoChanges after Visual Depth Index API changed from float to int 08/132508/1
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

7 years agoUsing new Devel API with depth index to register visuals 85/132485/1
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

7 years agoChanges required after Visual parent-origin & anchor-point defaults change 54/132354/2
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

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

7 years ago[dali_1.2.42] Merge branch 'devel/master' 64/132364/1
Nick Holland [Fri, 2 Jun 2017 11:56:48 +0000 (12:56 +0100)]
[dali_1.2.42] Merge branch 'devel/master'

Change-Id: I96af28a60865083861d7723e9c7583274974513c

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

Change-Id: I8e1f60ce8b6ef03df50806a092e56571d81d113f

7 years ago(Text Scrolling) Change horizontal alignment and ensure auto scrolling still works 15/132015/3
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

7 years agoMerge "Fix the broken popup layout in text field example" into devel/master
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

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

Change-Id: I1b2fa79708f93836069ed81a0d4c17c6aeb6094d

7 years agoFix the broken popup layout in text field example 67/131967/1
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

7 years agoChanges required after Visual related Control APIs moved to Devel API 77/131177/2
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

7 years ago[dali_1.2.41] Merge branch 'devel/master' 51/131351/1
greynaga [Fri, 26 May 2017 12:31:56 +0000 (13:31 +0100)]
[dali_1.2.41] Merge branch 'devel/master'

Change-Id: I48c6cf9d568d1836463ee5751d083f81e6f50282

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

Change-Id: I31b281ebcd6363156f8ee0bc30b1b34446b61b18

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

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

7 years agoUse Handle::GetCurrentProperty instead of Devel API 61/130361/2
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>
7 years ago[dali_1.2.40] Merge branch 'devel/master' 32/130232/1
Francisco Santos [Fri, 19 May 2017 12:44:19 +0000 (13:44 +0100)]
[dali_1.2.40] Merge branch 'devel/master'

Change-Id: Ia9e79d501711ea2deacb5bb2c18e8b67f39f2993

7 years agoDALi Version 1.2.40 28/130228/1 dali_1.2.40
Francisco Santos [Fri, 19 May 2017 12:43:49 +0000 (13:43 +0100)]
DALi Version 1.2.40

Change-Id: I675fcdf6232d811bf08ff2a2e0ddc692b68b322f

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

Change-Id: I6b4629923ff9d20b48a0ba0b07369bea00900bfb

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

Change-Id: Ie9609827834e05cb010eda842b415186f80989da

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

7 years agoMerge "Text scrolling example use scrolling stop mode(FINISH_LOOP, IMMEDIATE) and...
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

7 years agoDALi ray marching / ray tracing example 00/127500/8
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?

7 years ago[dali_1.2.39] Merge branch 'devel/master' 49/129049/1
David Steele [Fri, 12 May 2017 12:43:25 +0000 (13:43 +0100)]
[dali_1.2.39] Merge branch 'devel/master'

Change-Id: I1dc9751c9631376e030c7376adee6092ada4e9e7

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

Change-Id: Ia7981fd8b3778a9f2d069c8456e0bf36b7dc9b16

7 years agoText scrolling example use scrolling stop mode(FINISH_LOOP, IMMEDIATE) and loop delay 49/126149/12
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

7 years ago[dali_1.2.38] Merge branch 'devel/master' 96/128096/1
Agnelo Vaz [Fri, 5 May 2017 09:53:13 +0000 (10:53 +0100)]
[dali_1.2.38] Merge branch 'devel/master'

Change-Id: I361e74d90042ee9f1343b71a6db6eabd871136eb

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

Change-Id: I27a5ead04d90b4009f1f0012a217e5710cc2daa6

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

Change-Id: Ice5ef50aa0bde7ddac16414dfac8615d76d9ec18

7 years ago[dali_1.2.37] Merge branch 'devel/master' 19/127719/1
Adeel Kazmi [Fri, 28 Apr 2017 10:33:49 +0000 (11:33 +0100)]
[dali_1.2.37] Merge branch 'devel/master'

Change-Id: Id8e40438fc8525e74243c31b9467bf52886cdf0d

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

Change-Id: I959d02c918463b8758c0c551940ad6b7cda34e49

7 years agoMerge "Changes after Set/Get synchronous behaviour of registered animatable & custom...
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
Adeel Kazmi [Fri, 21 Apr 2017 11:38:46 +0000 (04:38 -0700)]
Merge "DALi Version 1.2.36" into devel/master

7 years ago[dali_1.2.36] Merge branch 'devel/master' 51/126451/1
adam.b [Fri, 21 Apr 2017 11:30:48 +0000 (12:30 +0100)]
[dali_1.2.36] Merge branch 'devel/master'

Change-Id: Id7712a06c89d3d0edc170efdd297f7fba441652a

7 years agoDALi Version 1.2.36 47/126447/1 dali_1.2.36
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
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 agoChanged RENDERING_TYPE to renderingType for video view 17/125817/1
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 ago[dali_1.2.35] Merge branch 'devel/master' 05/125005/1
Umar [Thu, 13 Apr 2017 09:26:32 +0000 (10:26 +0100)]
[dali_1.2.35] Merge branch 'devel/master'

Change-Id: I884ba8d0ca9f9d530ee66f778b4519838d652fde

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

Change-Id: Ic0964483674ddc18950f2c753507a88b32a9c710

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

7 years ago[dali_1.2.34] Merge branch 'devel/master' 99/123899/1
Nick Holland [Fri, 7 Apr 2017 10:12:22 +0000 (11:12 +0100)]
[dali_1.2.34] Merge branch 'devel/master'

Change-Id: If44623378fd40e4b8efcabc396391a13c5e4e6d2

7 years agoDALi Version 1.2.34 95/123895/1 dali_1.2.34
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
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
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
adam.b [Tue, 28 Mar 2017 17:25:39 +0000 (18:25 +0100)]
Tutorials added to the xml file

Change-Id: I6fe21917c21063709d1516c0bcf5d83530908161

7 years ago[dali_1.2.33] Merge branch 'devel/master' 42/122442/2
Adeel Kazmi [Mon, 3 Apr 2017 10:31:42 +0000 (11:31 +0100)]
[dali_1.2.33] Merge branch 'devel/master'

Change-Id: I96f3f8887814d6813999650dfa210bd3ce946992

7 years agoMerge "DALi Version 1.2.33" into devel/master
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
Richard Huang [Fri, 31 Mar 2017 09:59:03 +0000 (10:59 +0100)]
DALi Version 1.2.33

Change-Id: I45bfcc74c0169df10333b28db1f584807160467f

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

Change-Id: I01f2785583486b5c26cee4ae8cfaa9ac1b40bb92

7 years agoAdd Back key support to examples which do not have it 19/120919/1
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
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 ago[dali_1.2.32] Merge branch 'devel/master' 77/120877/1
Victor Cebollada [Fri, 24 Mar 2017 11:52:16 +0000 (11:52 +0000)]
[dali_1.2.32] Merge branch 'devel/master'

Change-Id: I977ad141cb18f7b9538f3360b99e5c68aa8b910d

7 years agoDALi Version 1.2.32 73/120873/1 dali_1.2.32
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
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 "DALi Version 1.2.31" into devel/master
Adeel Kazmi [Fri, 17 Mar 2017 16:22:51 +0000 (09:22 -0700)]
Merge "DALi Version 1.2.31" into devel/master

7 years ago[dali_1.2.31] Merge branch 'devel/master' 31/119631/1
Francisco Santos [Fri, 17 Mar 2017 16:16:29 +0000 (16:16 +0000)]
[dali_1.2.31] Merge branch 'devel/master'

Change-Id: I509ddb6225654922657915b3dca17cd1fe26b1ad

7 years agoDALi Version 1.2.31 27/119627/1 dali_1.2.31
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
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
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 "DALi Version 1.2.30" into devel/master
Adeel Kazmi [Fri, 10 Mar 2017 15:05:39 +0000 (07:05 -0800)]
Merge "DALi Version 1.2.30" into devel/master

7 years ago[dali_1.2.30] Merge branch 'devel/master' 68/118468/1
David Steele [Fri, 10 Mar 2017 15:02:27 +0000 (15:02 +0000)]
[dali_1.2.30] Merge branch 'devel/master'

Change-Id: I4a0a4300a9c1598344bcb257cfc2fcba72ef3006

7 years agoDALi Version 1.2.30 64/118464/1 dali_1.2.30
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
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
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
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
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
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
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 ago[dali_1.2.29] Merge branch 'devel/master' 97/117297/1
Agnelo Vaz [Fri, 3 Mar 2017 14:07:40 +0000 (14:07 +0000)]
[dali_1.2.29] Merge branch 'devel/master'

Change-Id: I1409c2df0c9f782dfda16343b181a3088cb795c0

7 years agoDALi Version 1.2.29 93/117293/1 dali_1.2.29
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
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
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
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
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
Nick Holland [Tue, 21 Feb 2017 10:54:26 +0000 (10:54 +0000)]
Remove redundant call to ResourceImage::GetImageSize()

Change-Id: I6fd663fad743bd52f1667108492cd92c3c150ad3

7 years ago[dali_1.2.28] Merge branch 'devel/master' 54/116454/1
Adeel Kazmi [Fri, 24 Feb 2017 09:35:30 +0000 (09:35 +0000)]
[dali_1.2.28] Merge branch 'devel/master'

Change-Id: I2e61146eca4cb9f4e68c76c0971ba35c2c20a8a3

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

Change-Id: I551e0e08ccc3737bf5e48bc19fc4168c29f21b5f