platform/core/uifw/dali-demo.git
9 years agoMerge remote-tracking branch 'origin/tizen' into devel/new_mesh 37/40737/1
Francisco Santos [Mon, 8 Jun 2015 09:56:20 +0000 (10:56 +0100)]
Merge remote-tracking branch 'origin/tizen' into devel/new_mesh

Conflicts:
examples/animated-shapes/animated-shapes-example.cpp
examples/bubble-effect/bubble-effect-example.cpp
examples/new-window/new-window-example.cpp
examples/path-animation/path-animation.cpp

Change-Id: I0e3fe040dfe9faaf9074617294d1fde7f0b7ef67

9 years agoDALi Version 1.0.43 91/40491/1 accepted/tizen_3.0.2015.q2_common tizen_3.0.2015.q2_common accepted/tizen/3.0.2015.q2/common/20150615.091823 accepted/tizen/common/20150611.081707 accepted/tizen/mobile/20150611.091339 accepted/tizen/tv/20150611.091531 accepted/tizen/wearable/20150611.085816 dali_1.0.43 submit/tizen/20150611.012320 submit/tizen_3.0.2015.q2_common/20150615.075539 submit/tizen_mobile/20150611.014034
Richard Huang [Thu, 4 Jun 2015 10:06:14 +0000 (11:06 +0100)]
DALi Version 1.0.43

Change-Id: I54c61b8b44c334b7ef79dbd90c81b402a6649d87

9 years agoMerge "ShaderEffect changes" into devel/new_mesh
Adeel Kazmi [Wed, 3 Jun 2015 15:08:37 +0000 (08:08 -0700)]
Merge "ShaderEffect changes" into devel/new_mesh

9 years agoFixes for removal of animatable property-buffer. 54/40254/2
Francisco Santos [Wed, 3 Jun 2015 12:41:55 +0000 (13:41 +0100)]
Fixes for removal of animatable property-buffer.

Change-Id: I32428f2a5be9009e5f3603ad9567b62b9db62c31

9 years agoRenamed FocusManager to AccessibilityFocusManager 52/40352/2
Richard Huang [Tue, 2 Jun 2015 16:48:48 +0000 (17:48 +0100)]
Renamed FocusManager to AccessibilityFocusManager

Change-Id: Iec4025ccaa95c00a19072cbb42a7b6ba4264b364

9 years agoChanges after 40127, changing control background to 0.f 74/40274/2
Kimmo Hoikka [Mon, 1 Jun 2015 16:31:39 +0000 (17:31 +0100)]
Changes after 40127, changing control background to 0.f

Change-Id: I05897aa4d0df28cab2e19557c80550420972a9b5

9 years agoTextField example added to Dali-demo 69/40269/1
Agnelo Vaz [Mon, 1 Jun 2015 15:43:38 +0000 (16:43 +0100)]
TextField example added to Dali-demo

Change-Id: I66ae6e4c10f46fe17ca1fd4b6d39abc3b39fc367
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoShaderEffect changes 02/39602/4
Ferran Sole [Mon, 18 May 2015 18:06:16 +0000 (19:06 +0100)]
ShaderEffect changes

Signed-off-by: Ferran Sole <ferran.sole@samsung.com>
Change-Id: I609dac012a4f1eba1d0838311e4abdc9f768e568

9 years agoMerge "Changes for std::vector removal from api" into tizen
Kimmo Hoikka [Fri, 29 May 2015 17:39:00 +0000 (10:39 -0700)]
Merge "Changes for std::vector removal from api" into tizen

9 years agoFix the wrong keyboard focus in the last page of dali-demo 69/40169/1
Richard Huang [Fri, 29 May 2015 16:39:23 +0000 (17:39 +0100)]
Fix the wrong keyboard focus in the last page of dali-demo

Change-Id: I937f9d2cab2779db646bf96c2c98904e468c1575

9 years agoFix crash when moving keyboard focus to the left in dali-demo 68/40168/1
Richard Huang [Fri, 29 May 2015 16:31:21 +0000 (17:31 +0100)]
Fix crash when moving keyboard focus to the left in dali-demo

Change-Id: I1ea3e1b4519ad9c48f12d3a5baf95111e83a5845

9 years agoMerge "Update keyboard focus direction enum for Control" into tizen
Kimmo Hoikka [Fri, 29 May 2015 15:57:17 +0000 (08:57 -0700)]
Merge "Update keyboard focus direction enum for Control" into tizen

9 years agoAdding New Folder Image for TextField Demo 57/40157/4
Agnelo Vaz [Fri, 29 May 2015 13:48:51 +0000 (14:48 +0100)]
Adding New Folder Image for TextField Demo

Change-Id: I5022e715803acfe04b84046b2e61e5c3826c50fe
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoUpdate keyboard focus direction enum for Control 39/40139/2
Richard Huang [Fri, 29 May 2015 10:39:36 +0000 (11:39 +0100)]
Update keyboard focus direction enum for Control

Change-Id: I8652c8be27a99b86d4af4ea6557a3d7f4d8d4aba

9 years agoChanges for std::vector removal from api 61/40161/2
Lee Morgan [Fri, 29 May 2015 13:52:11 +0000 (14:52 +0100)]
Changes for std::vector removal from api

Change-Id: I9f0acd2d9f4c70911e883d6637772e62c5e509e7

9 years agoStop using Z-position hacks in text-label.example 30/40130/1
Paul Wisbey [Fri, 29 May 2015 09:56:24 +0000 (10:56 +0100)]
Stop using Z-position hacks in text-label.example

(also stop hiding the text with mGrabCorner)

Change-Id: I74c91714615e44384c1baadfc74621bd9f11c4f9

9 years agoMerge "TextField Demo to use Popup and Label interaction" into tizen
Paul Wisbey [Fri, 29 May 2015 09:36:39 +0000 (02:36 -0700)]
Merge "TextField Demo to use Popup and Label interaction" into tizen

9 years agoDALi Version 1.0.42 09/40109/1 accepted/tizen/common/20150529.134055 dali_1.0.42 submit/tizen/20150529.082236
Adeel Kazmi [Fri, 29 May 2015 08:01:34 +0000 (09:01 +0100)]
DALi Version 1.0.42

Change-Id: Ib5a83c7729f9ac5ac426af2a7cac9adfeb240028

9 years agoTextField Demo to use Popup and Label interaction 59/40059/3
Agnelo Vaz [Thu, 28 May 2015 10:49:39 +0000 (11:49 +0100)]
TextField Demo to use Popup and Label interaction

Change-Id: Ib515e9d7d5c854408832bd3eb94ee6626d396ad2
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoUpdated needed for Internal::Control cleanup 13/40013/1 accepted/tizen/common/20150529.134111 accepted/tizen/mobile/20150529.134838 accepted/tizen/tv/20150529.134913 accepted/tizen/wearable/20150529.134856 submit/tizen/20150529.084413
Kimmo Hoikka [Wed, 27 May 2015 14:52:06 +0000 (15:52 +0100)]
Updated needed for Internal::Control cleanup

Change-Id: I017f05ad58a7c52c6c6d348835dcbbec025a3091

9 years agoRemove unnecessary use of ImageActor from bubble-demo 35/39935/1 accepted/tizen/mobile/20150604.121242 accepted/tizen/tv/20150604.121300 accepted/tizen/wearable/20150604.121342 submit/tizen_mobile/20150604.084537 submit/tizen_tv/20150604.084545 submit/tizen_wearable/20150604.084552
Kimmo Hoikka [Tue, 26 May 2015 15:22:04 +0000 (16:22 +0100)]
Remove unnecessary use of ImageActor from bubble-demo

Change-Id: Iba0598878f2816bf2bce28c6daefb9d6ddca1140

9 years agoUpdate with the change of Orientation in adaptor 04/39804/1
Xiangyin Ma [Fri, 22 May 2015 16:16:28 +0000 (17:16 +0100)]
Update with the change of Orientation in adaptor

Change-Id: I6aafe45472d4e9d564af9873faa277b17d4d39fa

9 years agoMerge "Update refraction-effect & radial-menu to use new mesh" into devel/new_mesh
Adeel Kazmi [Fri, 22 May 2015 15:33:09 +0000 (08:33 -0700)]
Merge "Update refraction-effect & radial-menu to use new mesh" into devel/new_mesh

9 years agoMerge "Add bubble-effect-example & new-window-example back to dali-demo" into devel...
Adeel Kazmi [Fri, 22 May 2015 13:17:03 +0000 (06:17 -0700)]
Merge "Add bubble-effect-example & new-window-example back to dali-demo" into devel/new_mesh

9 years agoAdd bubble-effect-example & new-window-example back to dali-demo 03/39603/4
Xiangyin Ma [Tue, 19 May 2015 10:47:59 +0000 (11:47 +0100)]
Add bubble-effect-example & new-window-example back to dali-demo

Change-Id: Iaa2d8ff06f7e401a8d9892772e4500aa8fe97ca1

9 years agoAdded a mesh sorting and blending example 96/38696/5
David Steele [Fri, 24 Apr 2015 16:12:51 +0000 (17:12 +0100)]
Added a mesh sorting and blending example

Displays 6 actors with different materials, alternating
opaque and transparent actors.
Actor 5 has the same material as Actor 1.

Clicking an actor will change it's depth index ( > value means drawn later )
Clicking outside the actors will change the Z values of all the actors

Change-Id: I37640dcbc98774e86948f6c26d7e6718ebb00a6b
Signed-off-by: David Steele <david.steele@partner.samsung.com>
9 years agoUpdate refraction-effect & radial-menu to use new mesh 57/39357/7
Xiangyin Ma [Wed, 13 May 2015 12:53:10 +0000 (13:53 +0100)]
Update refraction-effect & radial-menu to use new mesh

Change-Id: I6007af3cd1f01b9e8845b9edf8cbbffdf2eef6c6

9 years agoChanges after table-view moved to public-api 40/39740/1
Adeel Kazmi [Thu, 21 May 2015 15:03:51 +0000 (16:03 +0100)]
Changes after table-view moved to public-api

Change-Id: Ica58c498c6ad3396494717abf90bf622c4d3739f

9 years agoMinor Fixes to demos 42/38942/3
David Steele [Thu, 30 Apr 2015 18:22:25 +0000 (19:22 +0100)]
Minor Fixes to demos

Change-Id: I089eedc9dc7ca3a14fe3a1b43d7a4e75ebc653ad

9 years agoSupply stylesheet using Application constructor 57/39557/5
Paul Wisbey [Mon, 18 May 2015 17:02:44 +0000 (18:02 +0100)]
Supply stylesheet using Application constructor

Change-Id: Ieab919e1ef93b46b66f1049a2845005d94bbf72f

9 years agoMerge remote-tracking branch 'origin/tizen' into devel/new_mesh 04/39604/1
Francisco Santos [Tue, 19 May 2015 10:55:33 +0000 (11:55 +0100)]
Merge remote-tracking branch 'origin/tizen' into devel/new_mesh

Conflicts:
examples/animated-shapes/animated-shapes-example.cpp
examples/new-window/new-window-example.cpp
examples/path-animation/path-animation.cpp
examples/radial-menu/radial-menu-example.cpp
examples/radial-menu/radial-sweep-view-impl.h
examples/radial-menu/radial-sweep-view.cpp
examples/refraction-effect/refraction-effect-example.cpp

Change-Id: I9da2bc5f3145cd179535081fca2d2504f4fd6cd6

9 years agoMove more public-api headers to devel-api. PART 3 89/39589/1
Nick Holland [Tue, 19 May 2015 07:46:24 +0000 (08:46 +0100)]
Move more public-api headers to devel-api. PART 3

Support for changes to dali-toolkit

Change-Id: I887617b627fccb1e24e5bcff9644e21cf9f01cde

9 years agoMove more public-api headers to devel-api. PART 2 92/39492/1
Nick Holland [Fri, 15 May 2015 11:10:08 +0000 (12:10 +0100)]
Move more public-api headers to devel-api. PART 2

Support for changes to dali-core header file locations

Change-Id: Ief6b52be1f061517bc0d8d5abed61fea4a463ab1

9 years agoSupport for devel-api folder 06/39206/4
Nick Holland [Mon, 11 May 2015 14:36:19 +0000 (15:36 +0100)]
Support for devel-api folder

Change-Id: Ic8bf6bcc2c19c7d919fea0de9120b0f991523f3e

9 years agoRemoved unused scroll-view effect changes 16/39416/4
Ferran Sole [Thu, 14 May 2015 13:44:15 +0000 (14:44 +0100)]
Removed unused scroll-view effect changes

Change-Id: I6555f2a4ca0578641c3a53d7ad1b217fa46c1c9a

9 years agoMerge "Added PropertyValue Array as a class" into tizen
Kimmo Hoikka [Thu, 14 May 2015 15:37:55 +0000 (08:37 -0700)]
Merge "Added PropertyValue Array as a class" into tizen

9 years agoAdded PropertyValue Array as a class 04/39404/3
Lee Morgan [Tue, 12 May 2015 14:55:23 +0000 (15:55 +0100)]
Added PropertyValue Array as a class

Change-Id: I440f386a091b41e4695d681ae56031eaa9b3710e

9 years agoFix the builder demo to activate ItemView layout properly 12/39412/1
Richard Huang [Thu, 14 May 2015 12:37:40 +0000 (13:37 +0100)]
Fix the builder demo to activate ItemView layout properly

Change-Id: I566306c6ab23c18cf2cdb1c210f798575e794c50

9 years agoUpdates after ItemLayout changes 62/39362/6
Adeel Kazmi [Wed, 13 May 2015 16:48:33 +0000 (17:48 +0100)]
Updates after ItemLayout changes

- ItemView Demo:
  - Fade in/out animation between layouts
  - Removed menu
  - No animations when adding/deleting/replacing items
  - Items in spiral layout are a lot closer together

- Builder Examples Demo
  - No visible changes

- Size Negotiation Demo
  - One button per line rather than two

Change-Id: I2d50a49e49fb2271f41715daec74469ea2aa112b

9 years agoUpdated demo for ScrollBar and ScrollView API changes 50/39050/6
Richard Huang [Thu, 7 May 2015 12:17:59 +0000 (13:17 +0100)]
Updated demo for ScrollBar and ScrollView API changes

Change-Id: I126a9ea79d3784dbf3357f7b5fb2af6d145815a2

9 years agoModified scroll-view-example to use path based scroll view effects 89/38989/7
Ferran Sole [Wed, 6 May 2015 08:29:50 +0000 (09:29 +0100)]
Modified scroll-view-example to use path based scroll view effects

Change-Id: Iebf13abe6ef65c880afa22c1010d5350a40c1067

9 years agoRemoved use of ActorContainer 12/39312/1
Nick Holland [Tue, 12 May 2015 17:57:16 +0000 (18:57 +0100)]
Removed use of ActorContainer

Change-Id: I185bf4da3387871dd264444d91328879c72cb319

9 years agoRemoved navigation control JSON file 00/39300/1
Nick Holland [Tue, 12 May 2015 14:25:37 +0000 (15:25 +0100)]
Removed navigation control JSON file

Change-Id: I22ca6b3c21d09bd569b2d63d9df9050f1397fd73

9 years agoFix version issues with 1.0.41 20/39220/1
Adeel Kazmi [Mon, 11 May 2015 14:45:18 +0000 (15:45 +0100)]
Fix version issues with 1.0.41

Change-Id: Ifd3f9da40caefe89caab105d03167a977b31182e

9 years agoRevert "DALi Version 1.0.41" 13/39113/1
Nick Holland [Fri, 8 May 2015 14:33:07 +0000 (07:33 -0700)]
Revert "DALi Version 1.0.41"

This reverts commit 8e073e809cf13a74699ccfa8f683d34ac26c6421.

Change-Id: I11d8dcf0812fb1c349eb1513332a28f650c5e3ca

9 years agoDALi Version 1.0.41 98/39098/1 accepted/tizen/common/20150512.125116 accepted/tizen/mobile/20150513.005626 accepted/tizen/tv/20150513.005259 accepted/tizen/wearable/20150513.005512 dali_1.0.41 submit/tizen/20150511.143422
Nick Holland [Fri, 8 May 2015 12:52:32 +0000 (13:52 +0100)]
DALi Version 1.0.41

Change-Id: I041904635a70e1dce3a3b6273987a0bcd12a8385

9 years agoAdded JSON shader effect 30/39030/1
Lee Morgan [Fri, 1 May 2015 13:50:38 +0000 (14:50 +0100)]
Added JSON shader effect

Change-Id: Ie55026f59d4d956f3982d9ed3ba43e3cf4efa7eb

9 years agoShow alternative placeholder text in TextField demo 91/38991/1
Paul Wisbey [Wed, 6 May 2015 09:33:04 +0000 (10:33 +0100)]
Show alternative placeholder text in TextField demo

Change-Id: Ibc2346a8655ef94ae67d38324b0302575e7c9179

9 years agoUse UNSIGNED_INT for index buffers. 86/38886/1
Francisco Santos [Wed, 29 Apr 2015 16:27:01 +0000 (17:27 +0100)]
Use UNSIGNED_INT for index buffers.

Change-Id: I0f13e936dfbb156885606d23d0d3d1bb9914faf5

9 years agoDALi Version 1.0.40 72/38872/1 dali_1.0.40
Lee Morgan [Wed, 29 Apr 2015 14:34:23 +0000 (15:34 +0100)]
DALi Version 1.0.40

Change-Id: Ic5d6475baaf2586da7f8029323343f35dcf4441d

9 years agoPrefer black text / white backgrounds by default 53/38653/8
Paul Wisbey [Thu, 23 Apr 2015 14:03:36 +0000 (15:03 +0100)]
Prefer black text / white backgrounds by default

Change-Id: I192e15bd0127e9b637234eb5525550183abfcf55

9 years agoMerge branch 'tizen' into devel/new_mesh 84/38784/1
Francisco Santos [Mon, 27 Apr 2015 13:22:15 +0000 (14:22 +0100)]
Merge branch 'tizen' into devel/new_mesh

Conflicts:
examples/animated-shapes/animated-shapes-example.cpp
examples/bubble-effect/bubble-effect-example.cpp
examples/new-window/new-window-example.cpp
examples/path-animation/path-animation.cpp
examples/radial-menu/radial-menu-example.cpp
examples/radial-menu/radial-sweep-view-impl.cpp
examples/refraction-effect/refraction-effect-example.cpp

Change-Id: I6bb0c29e38e270ce7fc212cbc78845a40881c9a4

9 years agoMerge "Alpha function changes" into tizen
Adeel Kazmi [Mon, 27 Apr 2015 09:21:20 +0000 (02:21 -0700)]
Merge "Alpha function changes" into tizen

9 years agoAlpha function changes 15/38415/6
Ferran Sole [Mon, 20 Apr 2015 13:48:12 +0000 (14:48 +0100)]
Alpha function changes

Change-Id: Iaaea70d0620aa122139ab40f8a00f94493677ac3

9 years agoImage Load-time Fitting and Sampling Modes Example 81/36381/10
Andrew Cox [Mon, 2 Mar 2015 15:39:36 +0000 (15:39 +0000)]
Image Load-time Fitting and Sampling Modes Example

Change-Id: I8558b0e432cbbf2470fc9b80b4178d20663b3758
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
9 years agoDelete view from toolkit and move cluster into demo 80/38680/2
Kingsley Stephens [Fri, 17 Apr 2015 12:15:46 +0000 (13:15 +0100)]
Delete view from toolkit and move cluster into demo

Change-Id: I54fd5e2f166a4f487a6b1e7e5193ad25f5411bd6

9 years agoDALi Version 1.0.39 44/38644/1 dali_1.0.39
Xiangyin Ma [Thu, 23 Apr 2015 11:04:33 +0000 (12:04 +0100)]
DALi Version 1.0.39

Change-Id: I97463b0a4ba89a5950386238150c8f43713eee92

9 years agoMerge "Size negotiation patch 4: Remove SetRelayoutEnabled" into tizen
Kimmo Hoikka [Mon, 20 Apr 2015 17:13:52 +0000 (10:13 -0700)]
Merge "Size negotiation patch 4: Remove SetRelayoutEnabled" into tizen

9 years agoCleanup for removal of ImageAttributes from public API 92/37592/6
Andrew Cox [Tue, 31 Mar 2015 14:54:06 +0000 (15:54 +0100)]
Cleanup for removal of ImageAttributes from public API

Change-Id: I5bafc645c223b173abdd20db00094c501c846ee4
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
9 years agoSize negotiation patch 4: Remove SetRelayoutEnabled 79/38279/5
Kingsley Stephens [Tue, 14 Apr 2015 13:01:16 +0000 (14:01 +0100)]
Size negotiation patch 4: Remove SetRelayoutEnabled

Change-Id: I75c664598c9c1d25c491ed67c35e08dd33bf96f6

9 years agoCleaned up Degree, Radian, AngleAxis and Quaternion classes 68/37068/3
Kimmo Hoikka [Wed, 15 Apr 2015 19:30:41 +0000 (20:30 +0100)]
Cleaned up Degree, Radian, AngleAxis and Quaternion classes
- Inline Degree, Radian and AngleAxis types to avoid unnecessary exports / export table lookups in using code
- Change AngleAxis to store a Radian angle for better accuracy
- Make Quaternion explicitly take a Radian as constructor

Change-Id: I61d807dc35e8b7b4cc0510b45c5019f12785878a

9 years agoMesh morphing demo. 17/38217/2
Francisco Santos [Tue, 14 Apr 2015 16:37:29 +0000 (17:37 +0100)]
Mesh morphing demo.

Change-Id: I9fa496ce7ed1aa2b616cd560d12e1eb3f8b197bb

9 years agoMerge "Use Orientation from Window not application class." into tizen
Kimmo Hoikka [Thu, 16 Apr 2015 13:31:06 +0000 (06:31 -0700)]
Merge "Use Orientation from Window not application class." into tizen

9 years agoText Field Scrolling Message Demo 98/38198/3
Agnelo Vaz [Tue, 24 Mar 2015 11:00:52 +0000 (11:00 +0000)]
Text Field Scrolling Message Demo

Change-Id: I71b1150a76099b136e1157734269f78ebc7e47a0
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoDALi Version 1.0.38 61/38261/1 dali_1.0.38
Ferran Sole [Wed, 15 Apr 2015 11:58:11 +0000 (12:58 +0100)]
DALi Version 1.0.38

Change-Id: I669a41072a93c2eba8f1367657778fc72d53eb70

9 years agoUse Orientation from Window not application class. 89/38089/2
Nick Holland [Fri, 10 Apr 2015 14:38:55 +0000 (15:38 +0100)]
Use Orientation from Window not application class.

Change-Id: I426313377c97b638fefdb376139f5fa03550ae49

9 years agoRevert to using SetBackgroundColor in text-label.example 13/38213/2
Paul Wisbey [Tue, 14 Apr 2015 14:00:01 +0000 (15:00 +0100)]
Revert to using SetBackgroundColor in text-label.example

Change-Id: I9ef0e8248dac3acdb0bb2b37625b5081739cb1df

9 years agoNew point and line demos 35/38035/5
David Steele [Thu, 9 Apr 2015 18:12:28 +0000 (19:12 +0100)]
New point and line demos

The point demo shows off multiple points each using a morph from one
sampler to another, and applying a hue to each point based on it's
angle.

The line demo shows off morphing between two position buffers.

The textured demo shows a single geometry being used by 2 different
renderers each with a different material, and also shows off uniform
mapping by animating a "fade-color" property which is mapped to a
"uFadeColor" uniform.

Change-Id: I53c0ed2f3849dffd4b9461f07bbce75308811d9b
Signed-off-by: David Steele <david.steele@partner.samsung.com>
9 years agoSize negotiation patch 3: Scope size negotiation enums 49/38149/3
Kingsley Stephens [Fri, 10 Apr 2015 09:24:25 +0000 (10:24 +0100)]
Size negotiation patch 3: Scope size negotiation enums

Fix buttons and logging examples

Change-Id: I21699757ea591f73d5a09393caa01fd2b621726c

9 years agoReduced text size for launcher labels 15/38115/2
Paul Wisbey [Mon, 13 Apr 2015 09:04:01 +0000 (10:04 +0100)]
Reduced text size for launcher labels

Change-Id: Idcaadfcdcc7b30aef0a13d7ccbda0ee250c0d15a

9 years agoMerge "DALi Version 1.0.37" into tizen
Kimmo Hoikka [Fri, 10 Apr 2015 14:51:55 +0000 (07:51 -0700)]
Merge "DALi Version 1.0.37" into tizen

9 years agoDALi Version 1.0.37 82/38082/1
Kingsley Stephens [Fri, 10 Apr 2015 14:35:39 +0000 (15:35 +0100)]
DALi Version 1.0.37

Change-Id: I2195d137fdc0091f29e395ee5b63b9cf4a90f1d5

9 years agoShow Light text in shadow-bone-lighting example 70/38070/1
Paul Wisbey [Fri, 10 Apr 2015 12:36:43 +0000 (13:36 +0100)]
Show Light text in shadow-bone-lighting example

Change-Id: I0250ce6fedcc6948aa6b4418bb13b5f742a2d960

9 years agoFix size negotiation example label centering and wrapping text 22/38022/2
Kingsley Stephens [Thu, 9 Apr 2015 15:15:21 +0000 (16:15 +0100)]
Fix size negotiation example label centering and wrapping text

Change-Id: I3f19359887fc598f3681b4ddcf55527bddceb7ca

9 years agoMerge branch 'new_text' into tizen 29/38029/1
Paul Wisbey [Thu, 9 Apr 2015 16:02:35 +0000 (17:02 +0100)]
Merge branch 'new_text' into tizen

Change-Id: Iff4a8ad638aa654b016d49a1dc07a602618f64be

9 years agoMerge remote-tracking branch 'origin/tizen' into new_text 28/38028/1
Paul Wisbey [Thu, 9 Apr 2015 16:00:39 +0000 (17:00 +0100)]
Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
demo/dali-demo.cpp

Change-Id: I7588735ebd065e6c00fd8ac1cd40aac9cf475303

9 years agoMerge remote-tracking branch 'origin/tizen' into new_text 12/38012/1
Paul Wisbey [Thu, 9 Apr 2015 12:23:19 +0000 (13:23 +0100)]
Merge remote-tracking branch 'origin/tizen' into new_text

Change-Id: Ica8aad6d34fbebf441eb859fb716935aeaf0105f

9 years agoSize negotiation patch 2: Fix builder example scripts 36/37936/3
Kingsley Stephens [Wed, 8 Apr 2015 13:13:18 +0000 (14:13 +0100)]
Size negotiation patch 2: Fix builder example scripts

Change-Id: I6f9e0583cb67a3297039d76759db5ab0ddec18b6

9 years agoFix to show sliders in path animation example 00/38000/1
Paul Wisbey [Thu, 9 Apr 2015 10:22:52 +0000 (11:22 +0100)]
Fix to show sliders in path animation example

Change-Id: Ib2dd9aba0fc63a0607c2d0da1c095650fd9ea9d4

9 years agoFixed dissolve effect issue 98/37998/1
Paul Wisbey [Thu, 9 Apr 2015 10:17:35 +0000 (11:17 +0100)]
Fixed dissolve effect issue

Change-Id: I166b928a4b12881dd2a21a753151bf7dfe6ef73e

9 years agoLabel added to Toolbars using correct API not actor Add. 47/37947/2
Agnelo Vaz [Wed, 8 Apr 2015 17:02:05 +0000 (18:02 +0100)]
Label added to Toolbars using correct API not actor Add.

Change-Id: Ifb875f21344436e3a3f210388445af1a00eded08
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoReplace a MoveBy by an AnimateBy. 75/37875/1
Victor Cebollada [Tue, 7 Apr 2015 14:53:15 +0000 (15:53 +0100)]
Replace a MoveBy by an AnimateBy.

Change-Id: I399401a09e722fd85a026ffc2189e6bd090147f9
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoUsing New Constraints 74/37874/1
Adeel Kazmi [Tue, 7 Apr 2015 14:46:50 +0000 (15:46 +0100)]
Using New Constraints

Change-Id: I67da11782751f55f9e2a020f5ba269e5baf57ced

9 years agoMerge remote-tracking branch 'origin/tizen' into new_text 50/37850/3
Paul Wisbey [Tue, 7 Apr 2015 10:38:23 +0000 (11:38 +0100)]
Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
demo/dali-table-view.cpp
examples/item-view/item-view-example.cpp
examples/size-negotiation/size-negotiation-example.cpp
examples/text-view/text-view-example.cpp

Change-Id: I4b9a9eb30ad190b329115ff093120ac06343e26d

9 years agoUpdating the builder examples to use TextLabel 06/37706/2
Paul Wisbey [Thu, 2 Apr 2015 15:55:22 +0000 (16:55 +0100)]
Updating the builder examples to use TextLabel

Change-Id: I922f38428990ae202109a65bd711629817574d30

9 years agoDALi Version 1.0.36 28/37728/1 accepted/tizen/common/20150407.101700 accepted/tizen/mobile/20150405.124157 accepted/tizen/tv/20150405.122329 accepted/tizen/wearable/20150405.123432 dali_1.0.36 submit/tizen/20150403.055812
Adeel Kazmi [Fri, 3 Apr 2015 05:51:28 +0000 (06:51 +0100)]
DALi Version 1.0.36

Change-Id: Ib6ce7c0a390be1d65546b2802da57c0042ec043c

9 years agoMerge "Size negotiation patch 1: Remove SetPreferred size" into tizen
Adeel Kazmi [Thu, 2 Apr 2015 17:57:50 +0000 (10:57 -0700)]
Merge "Size negotiation patch 1: Remove SetPreferred size" into tizen

9 years agoUse PropertyBuffers in the mesh example. 34/37134/2
Francisco Santos [Thu, 19 Mar 2015 16:51:02 +0000 (16:51 +0000)]
Use PropertyBuffers in the mesh example.

Change-Id: I63bd826f3b0cff77baceef0db81c0b1f11d4de4e

9 years agoAdded animated uniforms to mesh example 96/37696/1
David Steele [Thu, 2 Apr 2015 14:47:14 +0000 (15:47 +0100)]
Added animated uniforms to mesh example

Change-Id: Ie04949472ff608b4a83a34e511e352ce693af453

9 years agoMerge "Use pre-defined animatable property index in ScrollView" into tizen
Adeel Kazmi [Thu, 2 Apr 2015 14:24:05 +0000 (07:24 -0700)]
Merge "Use pre-defined animatable property index in ScrollView" into tizen

9 years agoFix for TextLabel demo styling 75/37675/4
Paul Wisbey [Thu, 2 Apr 2015 09:56:48 +0000 (10:56 +0100)]
Fix for TextLabel demo styling

Change-Id: I2844fd73a4bb49389d3df8dc287785ed415d2823

9 years agoSize negotiation patch 1: Remove SetPreferred size 78/37678/2
Kingsley Stephens [Thu, 2 Apr 2015 10:37:59 +0000 (11:37 +0100)]
Size negotiation patch 1: Remove SetPreferred size

Change-Id: I33d4a33a2b50e1d5a5debf1a2f5be5f24c97dd0a

9 years agoFixes for text related actors after new size negotiation. 50/37650/2
Victor Cebollada [Wed, 1 Apr 2015 15:08:52 +0000 (16:08 +0100)]
Fixes for text related actors after new size negotiation.

Change-Id: I289af8a59b4b1f67fc1dbea92b0457194da6847a
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
9 years agoUse pre-defined animatable property index in ScrollView 47/37647/2
Richard Huang [Wed, 1 Apr 2015 15:03:50 +0000 (16:03 +0100)]
Use pre-defined animatable property index in ScrollView

Change-Id: I60fcc4e9a85e889fb0fe988859a42a87d83acb87

9 years agoReplace TextView with TextLabel (again) 43/37643/1
Paul Wisbey [Wed, 1 Apr 2015 13:57:31 +0000 (14:57 +0100)]
Replace TextView with TextLabel (again)

Change-Id: I8ac0787692b34882c2d98717ab778574dbdab7a0

9 years agoRemove constraints from transition effects demos 42/37642/1
Adeel Kazmi [Wed, 1 Apr 2015 13:53:23 +0000 (14:53 +0100)]
Remove constraints from transition effects demos

Change-Id: I0773bbe89cca6acc654059af25897b52e3c58f9c

9 years agoUpdates to Text Field demo after new Size negotiation API 38/37638/2
Agnelo Vaz [Wed, 1 Apr 2015 12:55:44 +0000 (13:55 +0100)]
Updates to Text Field demo after new Size negotiation API

Change-Id: I52f3b59064ae8c1e6951132b2e3a4c38e7d4b759
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
9 years agoReplace TextView with TextLabel 02/37602/9
Paul Wisbey [Tue, 31 Mar 2015 17:19:09 +0000 (18:19 +0100)]
Replace TextView with TextLabel

Change-Id: I5932f0191f358e986fcaace820fb2ecb43b9812b

9 years agoMerge branch 'tizen' into devel/new_mesh 95/37595/2
David Steele [Tue, 31 Mar 2015 15:03:54 +0000 (16:03 +0100)]
Merge branch 'tizen' into devel/new_mesh

Change-Id: I12978fe6e331f545fbdf7d9ba045a183d0ae1376

9 years agoMerge remote-tracking branch 'origin/tizen' into new_text 46/37546/10
Paul Wisbey [Mon, 30 Mar 2015 18:33:17 +0000 (19:33 +0100)]
Merge remote-tracking branch 'origin/tizen' into new_text

Conflicts:
demo/dali-demo.cpp
demo/dali-table-view.cpp
examples/builder/examples.cpp
examples/buttons/buttons-example.cpp
examples/item-view/item-view-example.cpp
examples/path-animation/path-animation.cpp
examples/text-view/text-view-example.cpp
shared/view.h

Change-Id: I152b06854b349f0430172227f1d79ee16855fbc0