dongsug.song [Fri, 31 Mar 2017 05:57:03 +0000 (14:57 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: If12fb6560b14a3d83693d4135c4e2d3530ccc55e
Seoyeon Kim [Mon, 27 Mar 2017 05:59:36 +0000 (14:59 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: Iab9636d4e7113374521306d69d85e1e914f6002c
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
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
Victor Cebollada [Fri, 24 Mar 2017 11:51:16 +0000 (11:51 +0000)]
DALi Version 1.2.32
Change-Id: I41d8a4a5355359d7df630b24cc04d33db8ad06c9
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
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
Adeel Kazmi [Fri, 17 Mar 2017 16:22:51 +0000 (09:22 -0700)]
Merge "DALi Version 1.2.31" into devel/master
Francisco Santos [Fri, 17 Mar 2017 16:15:43 +0000 (16:15 +0000)]
DALi Version 1.2.31
Change-Id: If5f42c790c843641cf2ccc5a1d7c3f14bc7145fd
Adeel Kazmi [Thu, 16 Mar 2017 18:35:16 +0000 (18:35 +0000)]
Updates following size and offset policy property changes
Change-Id: I59fbcbdea60da95ec599528fe76b2a227355711c
Adeel Kazmi [Wed, 15 Mar 2017 16:05:13 +0000 (09:05 -0700)]
Merge "Fixed launcher for textured-mesh example" into devel/master
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
Adeel Kazmi [Fri, 10 Mar 2017 15:05:39 +0000 (07:05 -0800)]
Merge "DALi Version 1.2.30" into devel/master
David Steele [Fri, 10 Mar 2017 15:01:26 +0000 (15:01 +0000)]
DALi Version 1.2.30
Change-Id: I9c3ab63b00d8fb2959032e8626ba732a8a53d3e5
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>
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>
Kimmo Hoikka [Thu, 9 Mar 2017 17:12:52 +0000 (09:12 -0800)]
Merge "Example of animating around a pivot" into devel/master
Adeel Kazmi [Tue, 21 Feb 2017 16:57:03 +0000 (16:57 +0000)]
Example of animating around a pivot
Change-Id: I4452b494bb6a3a094787480dd60c38f140d36e20
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>
Agnelo Vaz [Thu, 2 Mar 2017 10:24:03 +0000 (10:24 +0000)]
Update demos to not use deprecated Button API
Change-Id: Iaf8e17feb02567a92f2ff83a050e8bc6652212a0
Agnelo Vaz [Fri, 3 Mar 2017 14:06:22 +0000 (14:06 +0000)]
DALi Version 1.2.29
Change-Id: I2e5b9410bb5b98b4a354d7154624cdc9642de890
Adeel Kazmi [Tue, 28 Feb 2017 13:39:43 +0000 (05:39 -0800)]
Merge "A simple control using visuals" into devel/master
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
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
Agnelo Vaz [Mon, 27 Feb 2017 16:47:57 +0000 (16:47 +0000)]
SVACE error, un-intialised variable in example
Change-Id: I78dec36ee7609f7beb3202dd77a785644702ce6e
Nick Holland [Tue, 21 Feb 2017 10:54:26 +0000 (10:54 +0000)]
Remove redundant call to ResourceImage::GetImageSize()
Change-Id: I6fd663fad743bd52f1667108492cd92c3c150ad3
suhyung Eom [Mon, 27 Feb 2017 02:21:05 +0000 (11:21 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: Ief09616fa9eb5342c31be091ee0d2f6b055d6dd0
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
Adeel Kazmi [Fri, 24 Feb 2017 09:34:18 +0000 (09:34 +0000)]
DALi Version 1.2.28
Change-Id: I551e0e08ccc3737bf5e48bc19fc4168c29f21b5f
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
Adeel Kazmi [Mon, 20 Feb 2017 15:49:13 +0000 (15:49 +0000)]
(Mesh Visual) Changed the stage colour
Change-Id: Ia0c00bd55018abeae0d478f33aa33d01bf7dfbdf
David Steele [Thu, 16 Feb 2017 16:46:11 +0000 (16:46 +0000)]
Updated shadow-button transition demo to use states and sub-states
Also updated the style sheet to set up the transitions for a future
patch in Toolkit.
Change-Id: I9e33a2ab3bc2fb9e9dac3fc01435d233d530c1a8
Signed-off-by: David Steele <david.steele@samsung.com>
David Steele [Thu, 16 Feb 2017 15:47:44 +0000 (15:47 +0000)]
Example of transitions of each visual type.
Change-Id: I8d15f1aec5cdca527f93283ff179dcf572e831ea
Paul Wisbey [Fri, 17 Feb 2017 16:28:35 +0000 (08:28 -0800)]
Merge "Remove last usage of SetImage( ResourceImage ) from examples" into devel/master
Paul Wisbey [Fri, 17 Feb 2017 16:27:55 +0000 (08:27 -0800)]
Merge "Stopped image-scaling examples using Deprecated SetImage( ResourceImage ) API" into devel/master
Nick Holland [Fri, 17 Feb 2017 15:10:34 +0000 (15:10 +0000)]
Remove last usage of SetImage( ResourceImage ) from examples
Change-Id: If2cb8f802e055f1afcea3bbfefd774872a8f90e6
Nick Holland [Fri, 17 Feb 2017 14:21:48 +0000 (14:21 +0000)]
Stopped image-scaling examples using Deprecated SetImage( ResourceImage ) API
Note: the examples no longer work correctly:
- Flickering
- Image scaling modes in ImageVisual aren't fully
functional.
Currently logs the following errors when image needs scaling up.
Change-Id: I972a4368719937edfdef9657e3c2f0155772fe67
ImageAtlas::UploadToAtlas(uint32_t, Dali::PixelData) Can not upscale the image from actual loaded size [ 326, 210 ] to specified size [ 358, 231 ]
adam.b [Fri, 17 Feb 2017 12:56:26 +0000 (12:56 +0000)]
DALi Version 1.2.27
Change-Id: I0fd57d2a93e89c31e8bbc3b2dd430dd42fa66fd0
Adeel Kazmi [Thu, 16 Feb 2017 19:45:57 +0000 (11:45 -0800)]
Merge "Updated mobile stylesheet for demo" into devel/master
David Steele [Thu, 16 Feb 2017 19:19:10 +0000 (19:19 +0000)]
Updated mobile stylesheet for demo
Change-Id: I91d6b400adb0e1b5262a1ca255ac32ca07945154
Signed-off-by: David Steele <david.steele@samsung.com>
Adeel Kazmi [Thu, 16 Feb 2017 17:14:09 +0000 (09:14 -0800)]
Merge "Remove examples using Deprecated SetImage( FrameBuffer ) API" into devel/master
Nick Holland [Thu, 16 Feb 2017 15:15:05 +0000 (15:15 +0000)]
Remove examples using Deprecated SetImage( FrameBuffer ) API
Examples removed dali-examples:
super-blur-bloom-example
new-window-example
page-turn-view-example
Example removed from dali-demo
meta-ball-explosion & refrac
The meta ball demos will be reimplemented with the new rendering API
Change-Id: Ib3026a2dce5728c4adf28951fa8cd7b9139ec28b
Seoyeon Kim [Thu, 16 Feb 2017 01:53:52 +0000 (17:53 -0800)]
Merge "[Tizen] Prepare for Tizen 4.0 Build" into tizen
David Steele [Wed, 15 Feb 2017 20:02:04 +0000 (20:02 +0000)]
Added focus styling to demo
Change-Id: I818b3770e5183d3597a1c6b991f3df989569fd34
MyungJoo Ham [Fri, 13 Jan 2017 05:38:13 +0000 (14:38 +0900)]
Prepare for Tizen 4.0 Build
I've assumed that Tizen 4.0 code is going to be more similar with 3.0
than 2.0.
Please do not rely on string == compare for version check.
Change-Id: I826b0e599b6b510e49543ef9e66a6976b5e27511
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
MyungJoo Ham [Fri, 13 Jan 2017 05:38:13 +0000 (14:38 +0900)]
[Tizen] Prepare for Tizen 4.0 Build
I've assumed that Tizen 4.0 code is going to be more similar with 3.0
than 2.0.
Please do not rely on string == compare for version check.
Change-Id: I826b0e599b6b510e49543ef9e66a6976b5e27511
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
Adeel Kazmi [Tue, 14 Feb 2017 15:51:31 +0000 (07:51 -0800)]
Merge "Remove batching from homescreen benchmark." into devel/master
Agnelo Vaz [Wed, 8 Feb 2017 17:10:38 +0000 (17:10 +0000)]
Spliting dali-demo into examples-reel and demo
Change-Id: I5c1c52ee969ac04a46412f8f6326a655fc7e63d5
David Steele [Fri, 10 Feb 2017 12:29:02 +0000 (04:29 -0800)]
Merge "Ensure buttons appears on top of super-blur-view control" into devel/master
Victor Cebollada [Fri, 10 Feb 2017 07:57:51 +0000 (07:57 +0000)]
DALi Version 1.2.26
Change-Id: I4a290d9d10f6974436fd9b3a1d173fc7a08cd203
Adeel Kazmi [Thu, 9 Feb 2017 17:55:19 +0000 (17:55 +0000)]
Ensure buttons appears on top of super-blur-view control
Change-Id: I1fb7619b2165870c5dd18097c04edb3f112f2824
Francisco Santos [Thu, 9 Feb 2017 09:50:40 +0000 (09:50 +0000)]
Remove batching from homescreen benchmark.
Change-Id: Ic4f20d0c4169cdedd20a2966edc67da5ec539849
minho.sun [Thu, 9 Feb 2017 02:23:04 +0000 (11:23 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: I6947f0c77b5e9925ad966bc8d7004d8a72ba61dd
Nick Holland [Tue, 7 Feb 2017 16:08:45 +0000 (16:08 +0000)]
Create ImageView with shader and Image at the same time
Change-Id: If22c12af7072927646e60ee320bd4e58f0702cb7
Adeel Kazmi [Thu, 26 Jan 2017 18:36:47 +0000 (18:36 +0000)]
Split shaders in JSONs over multiple lines
Change-Id: I231d03ba20e15626ed7d6020d65fbbac3411ccff
Adeel Kazmi [Mon, 6 Feb 2017 14:05:49 +0000 (06:05 -0800)]
Merge "Update progress bar example" into devel/master
Paul Wisbey [Fri, 3 Feb 2017 16:12:48 +0000 (08:12 -0800)]
Merge "Javanese, Sundanese, Xhosa and Zulu strigns added." into devel/master
David Steele [Fri, 3 Feb 2017 15:41:44 +0000 (07:41 -0800)]
Merge "DALi Version 1.2.25" into devel/master
Umar [Fri, 3 Feb 2017 15:37:56 +0000 (15:37 +0000)]
DALi Version 1.2.25
Change-Id: I81a6105c8f4fb499e05103b74ad5f0861100ea27
Victor Cebollada [Fri, 3 Feb 2017 14:21:11 +0000 (14:21 +0000)]
Javanese, Sundanese, Xhosa and Zulu strigns added.
Change-Id: If4baf934350fe467695f69e20a0d222651ac7824
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Adeel Kazmi [Fri, 3 Feb 2017 09:41:56 +0000 (09:41 +0000)]
Fix SVACE error caused by uninitialised member
Change-Id: Idd4cae871e9003c1f7535dcceb4bc6f26e7fbb51
minho.sun [Thu, 19 Jan 2017 10:05:40 +0000 (19:05 +0900)]
Update progress bar example
Update progress bar example.
There are three new buttons to check new properies of Progress bar.
Change-Id: I9bf0607e3fb3763b37ca88c80040d9713b731169
Signed-off-by: minho.sun <minho.sun@samsung.com>
Agnelo Vaz [Fri, 27 Jan 2017 11:27:31 +0000 (11:27 +0000)]
Cube transition example to use ToggleButton for effect changes
Change-Id: Ib4484df7478e578817a6663838271bf7a6d87461
Nick Holland [Fri, 27 Jan 2017 15:14:50 +0000 (15:14 +0000)]
DALi Version 1.2.24
Change-Id: I0e7100883cb682fc58b3761eae52c8415391a3f0
Ferran Sole [Tue, 24 Jan 2017 17:57:39 +0000 (17:57 +0000)]
Removed Atlas example
Change-Id: I48cb4bef5d1e5bcb9f32bbd3e04cf186387dcce3
Paul Wisbey [Tue, 24 Jan 2017 13:41:14 +0000 (13:41 +0000)]
Removed NOOP page position setters
ScrollViewPagePathEffect is supplying the real positions
Change-Id: I4697ad3b5f341eb075ec7cda4bf3e1a636a6da6e
Richard Huang [Fri, 20 Jan 2017 13:36:22 +0000 (13:36 +0000)]
DALi Version 1.2.23
Change-Id: Ie8c74ec167bfdb8403d9f72ed2f5667df94161f3
Seoyeon Kim [Fri, 20 Jan 2017 05:19:10 +0000 (14:19 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: Idf27811f3dc3921c9627f1a4eab395e2681be6d7
Kimmo Hoikka [Wed, 18 Jan 2017 12:54:33 +0000 (04:54 -0800)]
Merge "(Clipping Example) Add a rotation effect around the X-axis as we scroll through the item-view" into devel/master
Adeel Kazmi [Wed, 18 Jan 2017 10:23:04 +0000 (10:23 +0000)]
(Clipping Example) Add a rotation effect around the X-axis as we scroll through the item-view
Change-Id: I4a485a758d54ca01c0bf5c2dc3d2162f27810241
Xiangyin Ma [Mon, 16 Jan 2017 19:03:50 +0000 (19:03 +0000)]
Update the AnimatedImageVisual demo
Change-Id: Ic7f90ed9cc5d59e3cdcd2741691c8d927b4e9037
David Steele [Fri, 13 Jan 2017 14:37:29 +0000 (06:37 -0800)]
Merge "DALi Version 1.2.22" into devel/master
David Steele [Fri, 13 Jan 2017 14:35:56 +0000 (14:35 +0000)]
DALi Version 1.2.22
Change-Id: I3ff7abffe275e0efba00daa1695f3c8485718536
David Steele [Mon, 9 Jan 2017 19:06:14 +0000 (19:06 +0000)]
Updated transition example to animate tick
The animation uses the pixel area and size to animate the tick when
the checkbox is enabled / disabled
Change-Id: I6fdae6b2d6eb0b36a499a2730dca279d539945f0
Signed-off-by: David Steele <david.steele@samsung.com>
David Steele [Tue, 20 Dec 2016 19:45:22 +0000 (19:45 +0000)]
Added application to test visual transition framework
This application shows a possible implementation of a shadowed button, with
transition animation defined by the style sheet.
Change-Id: Ib764dacdeed2381d96474059ef830e17a2cb9fff
Signed-off-by: David Steele <david.steele@samsung.com>
Agnelo Vaz [Wed, 11 Jan 2017 15:56:17 +0000 (15:56 +0000)]
Use Property:LABEL instead of SetLabelText for buttons
Change-Id: I905c14141ad4f207c8bcbb3c29d68c1f698f0530
Xiangyin Ma [Thu, 12 Jan 2017 11:48:22 +0000 (11:48 +0000)]
Remove the usage of deprecated Button APIS
Exclude SetLabelText() which will be replaced after the LABEL property supports both MAP and STRING type.
Change-Id: I7aae9bdacbe85ff8b07f0e0ac122db2f50bf24bc
Kimmo Hoikka [Wed, 11 Jan 2017 13:53:42 +0000 (05:53 -0800)]
Merge "Keep c++ flags from environment." into devel/master
Adeel Kazmi [Fri, 6 Jan 2017 17:12:17 +0000 (17:12 +0000)]
Ensure environment variable DALI_APPLICATION_PACKAGE get set regardless of desktop or target builds
This is required for older Tizen builds.
Change-Id: Ia81e14360ce657c2b8f1a0809c36649ed17f51a8
Adeel Kazmi [Fri, 6 Jan 2017 15:51:21 +0000 (15:51 +0000)]
Reduce size of shape images used in dali-demo
Change-Id: Id05789e07cc0d9db87ee8df1f5823ca909a13693
Kimmo Hoikka [Fri, 6 Jan 2017 15:40:20 +0000 (07:40 -0800)]
Merge "Replaced buffer image generation in dali-demo with simple images" into devel/master
Adeel Kazmi [Fri, 6 Jan 2017 14:18:37 +0000 (06:18 -0800)]
Merge "DALi Version 1.2.21" into devel/master
Agnelo Vaz [Fri, 6 Jan 2017 14:01:30 +0000 (14:01 +0000)]
DALi Version 1.2.21
Change-Id: I48459cf26932dfdc0d897aa487b0944b6957b0af
Adeel Kazmi [Fri, 6 Jan 2017 13:26:35 +0000 (13:26 +0000)]
Replaced buffer image generation in dali-demo with simple images
Distance field buffer images were created every time.
Just outputted this information to a file and loading this instead -> much quicker.
Also removes the need for using BufferImages (deprecated APIs)
Change-Id: Ibdfd17f2798f88f29ad9d66afe68b38853b1b19c
Francisco Santos [Fri, 6 Jan 2017 11:33:25 +0000 (11:33 +0000)]
Keep c++ flags from environment.
Change-Id: Ia892dcd39c87aa6628d9d7b12120eb0f414c047a
Adeel Kazmi [Wed, 4 Jan 2017 15:30:34 +0000 (15:30 +0000)]
Added an example which shows the automatic clipping feature of controls
Change-Id: I777970b091ded350612e421d147b7b4d3cca0b76
Seoyeon Kim [Wed, 4 Jan 2017 07:42:33 +0000 (16:42 +0900)]
Merge branch 'devel/master' into tizen
- Integration 1.2.14 -> 1.2.20 (Version up)
Change-Id: If9f846623edd5af4521e8288ce208607a5cda1d1
Adeel Kazmi [Thu, 29 Dec 2016 17:04:49 +0000 (17:04 +0000)]
Added more styles to the Progress Bar demo
Change-Id: I0de3cca8635ffa51befcb3420a00769b49fd472d
Adeel Kazmi [Fri, 30 Dec 2016 10:46:06 +0000 (10:46 +0000)]
DALi Version 1.2.20
Change-Id: I0af24652e21f05d456d978193e1bf144915c8574
Adeel Kazmi [Fri, 23 Dec 2016 10:41:29 +0000 (10:41 +0000)]
Added a tooltip example
Change-Id: I5909a67d2bff74f23c758862198df4da1e6c4627
Adeel Kazmi [Fri, 16 Dec 2016 15:06:08 +0000 (07:06 -0800)]
Merge "(Visual Transitions) Ensure all parameters are initialized in the constructor" into devel/master
Adeel Kazmi [Fri, 16 Dec 2016 13:58:03 +0000 (05:58 -0800)]
Merge "Added Animated Gif example" into devel/master
Adeel Kazmi [Fri, 16 Dec 2016 13:40:16 +0000 (13:40 +0000)]
(Visual Transitions) Ensure all parameters are initialized in the constructor
Change-Id: I7ce54d7bee33741b634bb51a5653b4a08e0958bc
Francisco Santos [Fri, 16 Dec 2016 13:20:03 +0000 (13:20 +0000)]
DALi Version 1.2.19
Change-Id: Ifc3362f5bc68a6a8031d2e250cb90f86a0748bf3
Xiangyin Ma [Tue, 13 Dec 2016 18:09:30 +0000 (18:09 +0000)]
Added Animated Gif example
Change-Id: I609238663f1ecd1d7925d5388f25e43c7094a294
Adeel Kazmi [Thu, 15 Dec 2016 16:01:55 +0000 (08:01 -0800)]
Merge "Custom control transform animation" into devel/master
David Steele [Tue, 13 Dec 2016 14:54:58 +0000 (14:54 +0000)]
Custom control transform animation
Added a new demo (transitions.example) that shows off animating
transform properties on a visual.
Change-Id: Ic333241f6618dcaf274d0e2ac399e0e5f3ed2a61
Agnelo Vaz [Wed, 14 Dec 2016 17:58:26 +0000 (17:58 +0000)]
Change sibbling order of buttons in svg example
Change-Id: I93398c5ff1f7dcdd4820cf90ebc11e81fee0fa05
Agnelo Vaz [Mon, 12 Dec 2016 16:18:17 +0000 (16:18 +0000)]
Popup buttons made larger to fit text with default point size
Change-Id: Ib478ca1d24461e6203810429d615af32973b4ef4
Agnelo Vaz [Thu, 8 Dec 2016 15:35:04 +0000 (15:35 +0000)]
Imageview svg demo to have offset from top of screen
Styling demo style sheet updates
Change-Id: Id5addc0be74c387b66b9db1132b4429c6a8af4ed
projects / platform / core / uifw / dali-demo.git / log