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
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
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>
David Steele [Thu, 30 Apr 2015 18:22:25 +0000 (19:22 +0100)]
Minor Fixes to demos
Change-Id: I089eedc9dc7ca3a14fe3a1b43d7a4e75ebc653ad
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
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
Nick Holland [Mon, 11 May 2015 14:36:19 +0000 (15:36 +0100)]
Support for devel-api folder
Change-Id: Ic8bf6bcc2c19c7d919fea0de9120b0f991523f3e
Ferran Sole [Thu, 14 May 2015 13:44:15 +0000 (14:44 +0100)]
Removed unused scroll-view effect changes
Change-Id: I6555f2a4ca0578641c3a53d7ad1b217fa46c1c9a
Kimmo Hoikka [Thu, 14 May 2015 15:37:55 +0000 (08:37 -0700)]
Merge "Added PropertyValue Array as a class" into tizen
Lee Morgan [Tue, 12 May 2015 14:55:23 +0000 (15:55 +0100)]
Added PropertyValue Array as a class
Change-Id: I440f386a091b41e4695d681ae56031eaa9b3710e
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
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
Richard Huang [Thu, 7 May 2015 12:17:59 +0000 (13:17 +0100)]
Updated demo for ScrollBar and ScrollView API changes
Change-Id: I126a9ea79d3784dbf3357f7b5fb2af6d145815a2
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
Nick Holland [Tue, 12 May 2015 17:57:16 +0000 (18:57 +0100)]
Removed use of ActorContainer
Change-Id: I185bf4da3387871dd264444d91328879c72cb319
Nick Holland [Tue, 12 May 2015 14:25:37 +0000 (15:25 +0100)]
Removed navigation control JSON file
Change-Id: I22ca6b3c21d09bd569b2d63d9df9050f1397fd73
Adeel Kazmi [Mon, 11 May 2015 14:45:18 +0000 (15:45 +0100)]
Fix version issues with 1.0.41
Change-Id: Ifd3f9da40caefe89caab105d03167a977b31182e
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
Nick Holland [Fri, 8 May 2015 12:52:32 +0000 (13:52 +0100)]
DALi Version 1.0.41
Change-Id: I041904635a70e1dce3a3b6273987a0bcd12a8385
Lee Morgan [Fri, 1 May 2015 13:50:38 +0000 (14:50 +0100)]
Added JSON shader effect
Change-Id: Ie55026f59d4d956f3982d9ed3ba43e3cf4efa7eb
Paul Wisbey [Wed, 6 May 2015 09:33:04 +0000 (10:33 +0100)]
Show alternative placeholder text in TextField demo
Change-Id: Ibc2346a8655ef94ae67d38324b0302575e7c9179
Francisco Santos [Wed, 29 Apr 2015 16:27:01 +0000 (17:27 +0100)]
Use UNSIGNED_INT for index buffers.
Change-Id: I0f13e936dfbb156885606d23d0d3d1bb9914faf5
Lee Morgan [Wed, 29 Apr 2015 14:34:23 +0000 (15:34 +0100)]
DALi Version 1.0.40
Change-Id: Ic5d6475baaf2586da7f8029323343f35dcf4441d
Paul Wisbey [Thu, 23 Apr 2015 14:03:36 +0000 (15:03 +0100)]
Prefer black text / white backgrounds by default
Change-Id: I192e15bd0127e9b637234eb5525550183abfcf55
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
Adeel Kazmi [Mon, 27 Apr 2015 09:21:20 +0000 (02:21 -0700)]
Merge "Alpha function changes" into tizen
Ferran Sole [Mon, 20 Apr 2015 13:48:12 +0000 (14:48 +0100)]
Alpha function changes
Change-Id: Iaaea70d0620aa122139ab40f8a00f94493677ac3
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>
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
Xiangyin Ma [Thu, 23 Apr 2015 11:04:33 +0000 (12:04 +0100)]
DALi Version 1.0.39
Change-Id: I97463b0a4ba89a5950386238150c8f43713eee92
Kimmo Hoikka [Mon, 20 Apr 2015 17:13:52 +0000 (10:13 -0700)]
Merge "Size negotiation patch 4: Remove SetRelayoutEnabled" into tizen
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>
Kingsley Stephens [Tue, 14 Apr 2015 13:01:16 +0000 (14:01 +0100)]
Size negotiation patch 4: Remove SetRelayoutEnabled
Change-Id: I75c664598c9c1d25c491ed67c35e08dd33bf96f6
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
Francisco Santos [Tue, 14 Apr 2015 16:37:29 +0000 (17:37 +0100)]
Mesh morphing demo.
Change-Id: I9fa496ce7ed1aa2b616cd560d12e1eb3f8b197bb
Kimmo Hoikka [Thu, 16 Apr 2015 13:31:06 +0000 (06:31 -0700)]
Merge "Use Orientation from Window not application class." into tizen
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>
Ferran Sole [Wed, 15 Apr 2015 11:58:11 +0000 (12:58 +0100)]
DALi Version 1.0.38
Change-Id: I669a41072a93c2eba8f1367657778fc72d53eb70
Nick Holland [Fri, 10 Apr 2015 14:38:55 +0000 (15:38 +0100)]
Use Orientation from Window not application class.
Change-Id: I426313377c97b638fefdb376139f5fa03550ae49
Paul Wisbey [Tue, 14 Apr 2015 14:00:01 +0000 (15:00 +0100)]
Revert to using SetBackgroundColor in text-label.example
Change-Id: I9ef0e8248dac3acdb0bb2b37625b5081739cb1df
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>
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
Paul Wisbey [Mon, 13 Apr 2015 09:04:01 +0000 (10:04 +0100)]
Reduced text size for launcher labels
Change-Id: Idcaadfcdcc7b30aef0a13d7ccbda0ee250c0d15a
Kimmo Hoikka [Fri, 10 Apr 2015 14:51:55 +0000 (07:51 -0700)]
Merge "DALi Version 1.0.37" into tizen
Kingsley Stephens [Fri, 10 Apr 2015 14:35:39 +0000 (15:35 +0100)]
DALi Version 1.0.37
Change-Id: I2195d137fdc0091f29e395ee5b63b9cf4a90f1d5
Paul Wisbey [Fri, 10 Apr 2015 12:36:43 +0000 (13:36 +0100)]
Show Light text in shadow-bone-lighting example
Change-Id: I0250ce6fedcc6948aa6b4418bb13b5f742a2d960
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
Paul Wisbey [Thu, 9 Apr 2015 16:02:35 +0000 (17:02 +0100)]
Merge branch 'new_text' into tizen
Change-Id: Iff4a8ad638aa654b016d49a1dc07a602618f64be
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
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
Kingsley Stephens [Wed, 8 Apr 2015 13:13:18 +0000 (14:13 +0100)]
Size negotiation patch 2: Fix builder example scripts
Change-Id: I6f9e0583cb67a3297039d76759db5ab0ddec18b6
Paul Wisbey [Thu, 9 Apr 2015 10:22:52 +0000 (11:22 +0100)]
Fix to show sliders in path animation example
Change-Id: Ib2dd9aba0fc63a0607c2d0da1c095650fd9ea9d4
Paul Wisbey [Thu, 9 Apr 2015 10:17:35 +0000 (11:17 +0100)]
Fixed dissolve effect issue
Change-Id: I166b928a4b12881dd2a21a753151bf7dfe6ef73e
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>
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>
Adeel Kazmi [Tue, 7 Apr 2015 14:46:50 +0000 (15:46 +0100)]
Using New Constraints
Change-Id: I67da11782751f55f9e2a020f5ba269e5baf57ced
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
Paul Wisbey [Thu, 2 Apr 2015 15:55:22 +0000 (16:55 +0100)]
Updating the builder examples to use TextLabel
Change-Id: I922f38428990ae202109a65bd711629817574d30
Adeel Kazmi [Fri, 3 Apr 2015 05:51:28 +0000 (06:51 +0100)]
DALi Version 1.0.36
Change-Id: Ib6ce7c0a390be1d65546b2802da57c0042ec043c
Adeel Kazmi [Thu, 2 Apr 2015 17:57:50 +0000 (10:57 -0700)]
Merge "Size negotiation patch 1: Remove SetPreferred size" into tizen
Francisco Santos [Thu, 19 Mar 2015 16:51:02 +0000 (16:51 +0000)]
Use PropertyBuffers in the mesh example.
Change-Id: I63bd826f3b0cff77baceef0db81c0b1f11d4de4e
David Steele [Thu, 2 Apr 2015 14:47:14 +0000 (15:47 +0100)]
Added animated uniforms to mesh example
Change-Id: Ie04949472ff608b4a83a34e511e352ce693af453
Adeel Kazmi [Thu, 2 Apr 2015 14:24:05 +0000 (07:24 -0700)]
Merge "Use pre-defined animatable property index in ScrollView" into tizen
Paul Wisbey [Thu, 2 Apr 2015 09:56:48 +0000 (10:56 +0100)]
Fix for TextLabel demo styling
Change-Id: I2844fd73a4bb49389d3df8dc287785ed415d2823
Kingsley Stephens [Thu, 2 Apr 2015 10:37:59 +0000 (11:37 +0100)]
Size negotiation patch 1: Remove SetPreferred size
Change-Id: I33d4a33a2b50e1d5a5debf1a2f5be5f24c97dd0a
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>
Richard Huang [Wed, 1 Apr 2015 15:03:50 +0000 (16:03 +0100)]
Use pre-defined animatable property index in ScrollView
Change-Id: I60fcc4e9a85e889fb0fe988859a42a87d83acb87
Paul Wisbey [Wed, 1 Apr 2015 13:57:31 +0000 (14:57 +0100)]
Replace TextView with TextLabel (again)
Change-Id: I8ac0787692b34882c2d98717ab778574dbdab7a0
Adeel Kazmi [Wed, 1 Apr 2015 13:53:23 +0000 (14:53 +0100)]
Remove constraints from transition effects demos
Change-Id: I0773bbe89cca6acc654059af25897b52e3c58f9c
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>
Paul Wisbey [Tue, 31 Mar 2015 17:19:09 +0000 (18:19 +0100)]
Replace TextView with TextLabel
Change-Id: I5932f0191f358e986fcaace820fb2ecb43b9812b
David Steele [Tue, 31 Mar 2015 15:03:54 +0000 (16:03 +0100)]
Merge branch 'tizen' into devel/new_mesh
Change-Id: I12978fe6e331f545fbdf7d9ba045a183d0ae1376
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
Heeyong Song [Tue, 31 Mar 2015 02:03:30 +0000 (11:03 +0900)]
Remove non-public APIs of Animation
Change-Id: Idc8fc2369f01eb7cb96635d15c1600fa3c368934
Adeel Kazmi [Mon, 30 Mar 2015 14:41:55 +0000 (07:41 -0700)]
Merge "Size negotiation example" into tizen
Richard Underhill [Fri, 27 Mar 2015 10:46:06 +0000 (10:46 +0000)]
Add shadow toggle and displacement function to text-label example
Change-Id: Ie7dcdc64bf70fea8ab68af85b729fa5a9de0b652
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
Nick Holland [Thu, 26 Mar 2015 17:38:49 +0000 (17:38 +0000)]
JavaScript and JSON command line launcher
Usage:
Will load both JSON and JavaScript file from command line
scripting.example my-scene.json my-script.js
Change-Id: I36330b8bae84a532f57989b4087843d178d03e0b
Kingsley Stephens [Wed, 25 Feb 2015 10:34:11 +0000 (10:34 +0000)]
Size negotiation example
Change-Id: Iffcdd6753c39fa83e7f68ef927339374bc0061a2
Victor Cebollada [Thu, 26 Mar 2015 15:38:13 +0000 (15:38 +0000)]
TextLabels vertically aligned.
Change-Id: I8609692959d95f0ee58213d9271a014ba85fb49d
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Paul Wisbey [Wed, 25 Mar 2015 14:05:01 +0000 (14:05 +0000)]
Added Demo specific stylesheets
Change-Id: I05a17ea530a14e94040f24db332178335ce3ce52
Victor Cebollada [Wed, 25 Mar 2015 16:26:51 +0000 (16:26 +0000)]
Non visible character removed from اُردُو (Urdu) string.
It caused a reordering issue.
Change-Id: I79a098f31873d55cc0e2d669e88d1e4adc547704
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Adeel Kazmi [Wed, 25 Mar 2015 15:07:18 +0000 (08:07 -0700)]
Merge "DALi Version 1.0.35" into tizen
Tom Robinson [Wed, 25 Mar 2015 14:02:43 +0000 (14:02 +0000)]
DALi Version 1.0.35
Change-Id: I2c5814f4c364e7fe1baf8da352c100529fc074ab
Paul Wisbey [Wed, 25 Mar 2015 10:09:12 +0000 (10:09 +0000)]
Fixed the Hello World example
Change-Id: I05e4ec4191816dc247d6536d4c85b3dbe43599ef
Yoonsang Lee [Tue, 24 Mar 2015 00:43:02 +0000 (09:43 +0900)]
Rename property & function for background image of Control
Update for following changes in dali-toolkit:
Control::Property::BACKGROUND -> Control::Property::BACKGROUND_IMAGE
Control::SetBackground() -> Control::SetBackgroundImage()
"background" -> "background-image"
Change-Id: I4fd1f14509fd14112bfeb38d0f18128b0f61ab2b
Paul Wisbey [Tue, 24 Mar 2015 18:24:39 +0000 (18:24 +0000)]
Minor string clean-up
Change-Id: Ib490798b013cf1847fb867dd478a571d28e6fc73
Paul Wisbey [Tue, 24 Mar 2015 17:58:38 +0000 (10:58 -0700)]
Merge "Temporarily disable i18n" into new_text
Paul Wisbey [Tue, 24 Mar 2015 17:42:00 +0000 (17:42 +0000)]
Temporarily disable i18n
(Until it's working on mobile)
Change-Id: I25cf304797046b68bf56a71357fedc406e08cd21
Paul Wisbey [Tue, 24 Mar 2015 09:27:59 +0000 (02:27 -0700)]
Revert "Work-around regression with vertical layout"
This reverts commit
a6f2bba05b6db85066145ed10d882e9514f267da.
Change-Id: I7c0993c884a61cf7d906f2da64fab0677d92774b
Paul Wisbey [Mon, 23 Mar 2015 18:21:15 +0000 (18:21 +0000)]
Work-around regression with vertical layout
Change-Id: Ica4f357358704c12dd69e882efcb49c6dffd233e
Paul Wisbey [Fri, 20 Mar 2015 17:22:49 +0000 (17:22 +0000)]
Merge remote-tracking branch 'origin/tizen' into new_text
Change-Id: Ie9718a263a8ab3b12209e1409754834ed986460f
Paul Wisbey [Thu, 19 Mar 2015 15:04:35 +0000 (15:04 +0000)]
Added more TextLabels
Change-Id: I4d107d2611cb03b218ea03e9b7e2d26b9b403127
David Steele [Fri, 13 Mar 2015 17:15:27 +0000 (17:15 +0000)]
Removed view from mesh-example
Change-Id: I171095602b6559adc0498698e638ef8590845766
Richard Huang [Thu, 19 Mar 2015 11:04:23 +0000 (11:04 +0000)]
DALi Version 1.0.34
Change-Id: Ia5d8582b8eec61517443f24e191e01662ba4a26d
Victor Cebollada [Thu, 19 Mar 2015 10:18:35 +0000 (10:18 +0000)]
Alignment option added.
Change-Id: I5f0e4ad2e2b52cd25aa8661dd95f688ac6c41a8b
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Paul Wisbey [Thu, 19 Mar 2015 10:00:22 +0000 (10:00 +0000)]
Merge remote-tracking branch 'origin/tizen' into new_text
Conflicts:
examples/text-view/text-view-example.cpp
Change-Id: I112aab85d61c49687bed286c4d6435fae35f416a
Andrew Cox [Mon, 23 Feb 2015 14:14:51 +0000 (14:14 +0000)]
Image scaling and filtering on load across all applicable demos
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
Change-Id: I7629356cb2678ee8eda85eff0cbef6a530ab7a17
Paul Wisbey [Tue, 17 Mar 2015 16:17:53 +0000 (16:17 +0000)]
Minor TextField demo tweaks
Change-Id: I092baac3133471d94aa62109548a745a74b037e0
Yoonsang Lee [Fri, 6 Mar 2015 08:52:49 +0000 (17:52 +0900)]
Actor's Transformation API Cleanup
Update for following changes in dali-core:
Actor::MoveBy -> TranslateBy
Actor::ColorBy -> <removed>
Actor::OpacityBy -> <removed>
Actor::SetRotation -> SetOrientation
Actor::GetCurrentRotation -> GetCurrentOrientation
Actor::GetCurrentWorldRotation -> GetCurrentWorldOrientation
Actor::SetInheritRotation -> SetInheritOrientation
Actor::IsRotationInherited -> IsOrientationInherited
Actor::Property::ROTATION -> Actor::Property::ORIENTATION
Actor::Property::WORLD_ROTATION -> Actor::Property::WORLD_ORIENTATION
Actor::Property::INHERIT_ROTATION -> Actor::Property::INHERIT_ORIENTATION
Change-Id: I0e883d5588e2f18beba32d64a2407253fe1fb286
Paul Wisbey [Mon, 16 Mar 2015 18:06:41 +0000 (18:06 +0000)]
Added TextField demo to XML
Change-Id: I2fb46cadadd81d5c30212f8db4d91386c3281a5d
projects / platform / core / uifw / dali-demo.git / log