platform/core/uifw/dali-toolkit.git
7 years agoFix control properties for C# custom view 08/114508/6
Richard Huang [Mon, 13 Feb 2017 14:25:21 +0000 (14:25 +0000)]
Fix control properties for C# custom view

Change-Id: I7034d61dcca047d9e7120870998524d228cacf8c

7 years agoAdd stylesheet to control-dashboard app and correct wrong indents 30/114330/1
minho.sun [Mon, 13 Feb 2017 04:20:39 +0000 (13:20 +0900)]
Add stylesheet to control-dashboard app and correct wrong indents

Add stylesheet to control-dashboard app to change all control's style to
VD UX.

And correct wrong indents to follow dali coding convention.

Change-Id: If0b06602fa67abe199234ac017144fae638dfaee
Signed-off-by: minho.sun <minho.sun@samsung.com>
7 years agoManual binding to add getter/setter APIs for various event classes (i.e. Gesture... 15/112215/14
Umar [Fri, 27 Jan 2017 18:49:49 +0000 (18:49 +0000)]
Manual binding to add getter/setter APIs for various event classes (i.e. Gesture, PanGesture, HoverEvent etc)

Change-Id: I7997428f66c73770b4d33f8e898a552f3d82366d

7 years agoMerge "Added scroll-bar to text selection toolbar" into devel/master
Adeel Kazmi [Fri, 10 Feb 2017 14:24:10 +0000 (06:24 -0800)]
Merge "Added scroll-bar to text selection toolbar" into devel/master

7 years ago(Automated Tests) Synchronize common code with core 20/114220/2
Adeel Kazmi [Fri, 10 Feb 2017 10:12:01 +0000 (10:12 +0000)]
(Automated Tests) Synchronize common code with core

Change-Id: I8ab5f93c782074322a8cb8a4c62f159bd14ca61e

7 years agoDALi Version 1.2.26 67/114167/1 dali_1.2.26
Victor Cebollada [Fri, 10 Feb 2017 07:57:30 +0000 (07:57 +0000)]
DALi Version 1.2.26

Change-Id: I05ac67f6fab6035b90f51407e46244a4e565292a

7 years agoMerge "Fixed 9-patch scale issue." into devel/master
Adeel Kazmi [Thu, 9 Feb 2017 17:07:53 +0000 (09:07 -0800)]
Merge "Fixed 9-patch scale issue." into devel/master

7 years agoMerge "Reduced size of control depth index ranges" into devel/master
Adeel Kazmi [Thu, 9 Feb 2017 17:07:32 +0000 (09:07 -0800)]
Merge "Reduced size of control depth index ranges" into devel/master

7 years agoMerge "Fix cursor display issue." into devel/master
Paul Wisbey [Thu, 9 Feb 2017 16:33:48 +0000 (08:33 -0800)]
Merge "Fix cursor display issue." into devel/master

7 years agoFix cursor display issue. 29/114029/3
Victor Cebollada [Thu, 9 Feb 2017 14:33:57 +0000 (14:33 +0000)]
Fix cursor display issue.

* On resume after the power key is pressed the text controller is
  still in edit mode.
  When the power key is pressed, the text controller is set to the
  INACTIVE state.

* @todo: Different applications may want a different behaviour on resume.

Change-Id: I770b991bc0c141b5a2db260cf7ef7a693ead4b02
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
7 years agoMerge "Text - Fix for text controller." into devel/master
Paul Wisbey [Thu, 9 Feb 2017 15:23:36 +0000 (07:23 -0800)]
Merge "Text - Fix for text controller." into devel/master

7 years agoFixed 9-patch scale issue. 31/114031/1
adam.b [Thu, 9 Feb 2017 14:59:26 +0000 (14:59 +0000)]
Fixed 9-patch scale issue.

Integrating scale with size was causing a glitch
during scaling a 9-patch image.

Change-Id: I2e633afbd44fa97802ad7f734ff54b156358fb13

7 years agoAdded scroll-bar to text selection toolbar 46/113446/9
Victor Cebollada [Tue, 7 Feb 2017 17:07:14 +0000 (17:07 +0000)]
Added scroll-bar to text selection toolbar

Change-Id: I93f87fcb2471c85ef251a3b396130677b0a7e070
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
7 years agoText - Fix for text controller. 53/113953/1
Victor Cebollada [Wed, 8 Feb 2017 14:33:24 +0000 (14:33 +0000)]
Text - Fix for text controller.

* Fixes the issue when two or more pre-edit events
  arrive from the imf manager.
  The text controller was not able to remove the
  previous text.

Change-Id: I85ba391f6d3c7f5609fbd0ba1b49cb3440059269
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
7 years agoFix SVACE issue - memory leak 05/113905/1
Heeyong Song [Thu, 9 Feb 2017 08:27:41 +0000 (17:27 +0900)]
Fix SVACE issue - memory leak

- Delete the elements of mResourceRequests

Change-Id: Ic4ba5a09e6c3dbfc8ebfc85a0344790f6a16a661

7 years agoUpdated doxygen comments in scroll-view constraints 49/113749/1
Adeel Kazmi [Wed, 8 Feb 2017 18:50:33 +0000 (18:50 +0000)]
Updated doxygen comments in scroll-view constraints

Change-Id: I125c7fd916f00d38e3fa3ca4c98f6aee41983544

7 years agoReduced size of control depth index ranges 22/113222/3
David Steele [Mon, 6 Feb 2017 20:22:11 +0000 (20:22 +0000)]
Reduced size of control depth index ranges

The control depth index ranges, used for setting the depth index of
visuals, needs to stay within the sibling order range, which is
defined as 1000. The existing values for background (used by button)
overlapped with sibling order and caused incorrect ordering in the svg
demo.

Of note is the Layer::TREE_DEPTH_MULTIPLIER is different from the
DevelLayer::TREE_DEPTH_MULTIPLIER value, and should be removed.

Change-Id: I176f277286840f5b57840661f285dc9261795769
Signed-off-by: David Steele <david.steele@samsung.com>
7 years agoMerge "Update doxygen comments" into devel/master
Adeel Kazmi [Wed, 8 Feb 2017 10:34:02 +0000 (02:34 -0800)]
Merge "Update doxygen comments" into devel/master

7 years agoUpdate doxygen comments 82/113482/1
Seoyeon Kim [Tue, 7 Feb 2017 05:54:43 +0000 (14:54 +0900)]
Update doxygen comments

- For document public release, Native API reference is checked by Lionbridge.

Change-Id: I78cad260974f386ceeeb1fbc8774815be2213457
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
7 years agoMerge "Stop resetting transform values to default in OnRelayout & OnSizeSet" into...
David Steele [Tue, 7 Feb 2017 15:50:30 +0000 (07:50 -0800)]
Merge "Stop resetting transform values to default in OnRelayout & OnSizeSet" into devel/master

7 years agoMerge "Initialise all members in TextVerticalScroller" into devel/master
Adeel Kazmi [Tue, 7 Feb 2017 14:36:32 +0000 (06:36 -0800)]
Merge "Initialise all members in TextVerticalScroller" into devel/master

7 years agoInitialise all members in TextVerticalScroller 07/113407/1
Adeel Kazmi [Tue, 7 Feb 2017 10:28:57 +0000 (10:28 +0000)]
Initialise all members in TextVerticalScroller

This fixes a reported SVACE error.

Change-Id: Ia35aa42de318c0031639ebd5cd963e7a124d71d8

7 years agoAdded ability to have strings over multiple lines in JSON using a Property Array 71/112171/6
Adeel Kazmi [Thu, 26 Jan 2017 18:35:55 +0000 (18:35 +0000)]
Added ability to have strings over multiple lines in JSON using a Property Array

Change-Id: If5734cc7fc66163febd837c87bc362e4f0b214b7

7 years agoStop resetting transform values to default in OnRelayout & OnSizeSet 92/113192/3
Adeel Kazmi [Mon, 6 Feb 2017 12:11:29 +0000 (12:11 +0000)]
Stop resetting transform values to default in OnRelayout & OnSizeSet

Previously, this reset any values that were set by the application/stylesheet.

Change-Id: Ib91f29fefc927a804b03b6d1b0b458d55c100f5d

7 years agoMerge "Add new properties to ProgressBar" into devel/master
Adeel Kazmi [Mon, 6 Feb 2017 14:05:40 +0000 (06:05 -0800)]
Merge "Add new properties to ProgressBar" into devel/master

7 years agoMerge "Added default styles for ToggleButton" into devel/master
Adeel Kazmi [Mon, 6 Feb 2017 13:53:03 +0000 (05:53 -0800)]
Merge "Added default styles for ToggleButton" into devel/master

7 years agoAdd new properties to ProgressBar 96/108896/29
minho.sun [Fri, 6 Jan 2017 06:41:36 +0000 (15:41 +0900)]
Add new properties to ProgressBar

Add new properties to ProgressBar

1. SECONDARY_PROGRESS_VALUE
  - Value of secondary progress

2. SECONDARY_PROGRESS_VISUAL
  - Visual to display how much the source is loaded

3. INDETERMINATED_VISUAL
  - Visual to display Indeterminate progress state
  - Indeterminate state means "applcation cannot cacluate current progress"

4. INDETERMINATED_VISUAL_TRANSITION
  - Transition data to animate indeterminate visual

5. INDETERMINATE
  - State to make indeterminate visual visible or not

6. LABEL_VISUAL
  - Visual to display progress

Change-Id: I9db231d29c547eaead58ea5c0ad761e82b4461f2
Signed-off-by: minho.sun <minho.sun@samsung.com>
7 years agoMerge "TextVisual documentation added to the Programming Guide." into devel/master
Adeel Kazmi [Fri, 3 Feb 2017 16:13:42 +0000 (08:13 -0800)]
Merge "TextVisual documentation added to the Programming Guide." into devel/master

7 years agoMerge "DALi Version 1.2.25" into devel/master
David Steele [Fri, 3 Feb 2017 15:41:32 +0000 (07:41 -0800)]
Merge "DALi Version 1.2.25" into devel/master

7 years agoDALi Version 1.2.25 14/113014/1 dali_1.2.25
Umar [Fri, 3 Feb 2017 15:37:42 +0000 (15:37 +0000)]
DALi Version 1.2.25

Change-Id: I6671b49c5596878bf87a6a6735daa54f3f1aa140

7 years agoMerge "Control property names in doxygen now match code" into devel/master
David Steele [Fri, 3 Feb 2017 15:11:05 +0000 (07:11 -0800)]
Merge "Control property names in doxygen now match code" into devel/master

7 years agoControl property names in doxygen now match code 65/112965/2
Agnelo Vaz [Fri, 3 Feb 2017 11:49:06 +0000 (11:49 +0000)]
Control property names in doxygen now match code

Change-Id: Ic3b28377d1927e7c8b10b48e670f8294ca385fb4

7 years agoTextVisual documentation added to the Programming Guide. 56/95456/5
Agnelo Vaz [Thu, 2 Feb 2017 16:30:05 +0000 (16:30 +0000)]
TextVisual documentation added to the Programming Guide.

Change-Id: I6cb6cebd21537f8000d41392f0df38ae8344d528
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
7 years agoAdded default styles for ToggleButton 89/112789/2
Umar [Thu, 2 Feb 2017 18:27:25 +0000 (18:27 +0000)]
Added default styles for ToggleButton

Change-Id: I420d1d6aab70e1f78818cf1157fbfb226d608606

7 years agoImplement vertical scroll animation on text input 32/108632/17
suhyung Eom [Thu, 5 Jan 2017 07:55:12 +0000 (16:55 +0900)]
Implement vertical scroll animation on text input

New property is added to control vertical scroll animation
set DevelTextEditor::Property::VERTICAL_SCROLL_ANIMATION true to enable scroll animation

Signed-off-by: suhyung Eom <suhyung.eom@samsung.com>
Change-Id: I5da8b1df603928e44b5f82d785227b67f6be4a5f

7 years agoMerge "Add style name to indicator of ScrollBar" into devel/master
Adeel Kazmi [Thu, 2 Feb 2017 19:23:38 +0000 (11:23 -0800)]
Merge "Add style name to indicator of ScrollBar" into devel/master

7 years agoMerge "Updated programming guide to explain how to create a visual" into devel/master
Adeel Kazmi [Thu, 2 Feb 2017 19:08:51 +0000 (11:08 -0800)]
Merge "Updated programming guide to explain how to create a visual" into devel/master

7 years agoAdd Toggle button example for dashboard demo. 56/112056/4
xb.teng [Wed, 25 Jan 2017 14:30:43 +0000 (22:30 +0800)]
Add Toggle button example for dashboard demo.

Change-Id: Ia6193084e2019e53814207811788d46ebaf5eb1b
Signed-off-by: xb.teng <xb.teng@samsung.com>
7 years agoToggle button c# binding. 54/112054/2
xb.teng [Wed, 25 Jan 2017 13:55:51 +0000 (21:55 +0800)]
Toggle button c# binding.

Change-Id: Iae916a83ca2522def658f309063c1f8531919041
Signed-off-by: xb.teng <xb.teng@samsung.com>
7 years agoUpdated programming guide to explain how to create a visual 85/112785/1
David Steele [Thu, 2 Feb 2017 16:39:36 +0000 (16:39 +0000)]
Updated programming guide to explain how to create a visual

Added information about how to create and register a visual.
Styling info is somewhat lacking, though.

Change-Id: I399be3a7dfde1d2c2b0cc4aad0fb706a084148c5
Signed-off-by: David Steele <david.steele@samsung.com>
7 years agoAdd style name to indicator of ScrollBar 27/112127/4
minho.sun [Thu, 26 Jan 2017 06:37:14 +0000 (15:37 +0900)]
Add style name to indicator of ScrollBar

Add style name to indicator of scrollbar.
Now developer can set their indicator style via stylesheet

Change-Id: Ifc6007147472ae7cc13161cc25c3c53eec5c11b0
Signed-off-by: minho.sun <minho.sun@samsung.com>
7 years agoMerge "Removed unused method GetTexture form test-actor-utils.h" into devel/master
Kimmo Hoikka [Mon, 30 Jan 2017 18:51:22 +0000 (10:51 -0800)]
Merge "Removed unused method GetTexture form test-actor-utils.h" into devel/master

7 years agoMerge "Fix the keyboard focus issue for nested table view" into devel/master
Adeel Kazmi [Mon, 30 Jan 2017 15:33:17 +0000 (07:33 -0800)]
Merge "Fix the keyboard focus issue for nested table view" into devel/master

7 years agoMerge "Enable json tree dump to work with empty arrays" into devel/master
David Steele [Fri, 27 Jan 2017 18:01:50 +0000 (10:01 -0800)]
Merge "Enable json tree dump to work with empty arrays" into devel/master

7 years agoEnable json tree dump to work with empty arrays 14/112214/1
Agnelo Vaz [Fri, 27 Jan 2017 17:54:10 +0000 (17:54 +0000)]
Enable json tree dump to work with empty arrays

If the json contains an empty array it would crash as there was no check before dereferencing a pointer.

Below constant section should be added to json to get debug output

  "constants":
  {

    "CONFIG_SCRIPT_LOG_LEVEL":"Verbose",
    "DUMP_TREE":1
  },

Change-Id: I9584fa0c4202ea7907a9235cdfb81264ab3596c6

7 years agoMerge "DALi Version 1.2.24" into devel/master
Adeel Kazmi [Fri, 27 Jan 2017 17:53:34 +0000 (09:53 -0800)]
Merge "DALi Version 1.2.24" into devel/master

7 years agoDALi Version 1.2.24 04/112204/1 dali_1.2.24
Nick Holland [Fri, 27 Jan 2017 15:14:37 +0000 (15:14 +0000)]
DALi Version 1.2.24

Change-Id: Ia0cfbdaa4ee648d94193c269d9a0adbc8071bb0f

7 years agoFix the keyboard focus issue for nested table view 01/112201/1
Richard Huang [Fri, 27 Jan 2017 15:13:27 +0000 (15:13 +0000)]
Fix the keyboard focus issue for nested table view

Change-Id: Ia45179b275e5f92f0e58ed5bd8fc3506a014b5fa

7 years agoAdd native dali toggle button, base on latest button using visual. 97/101797/31
xb.teng [Fri, 2 Dec 2016 07:07:55 +0000 (15:07 +0800)]
Add native dali toggle button, base on latest button using visual.

Change-Id: Ib4b7974fdf7f2d81d704b926a840126440aa345a
Signed-off-by: xb.teng <xb.teng@samsung.com>
7 years agoManual binding to add getter/setter APIs for Hover 57/112157/4
Umar [Thu, 26 Jan 2017 14:54:19 +0000 (14:54 +0000)]
Manual binding to add getter/setter APIs for Hover

Change-Id: I0bd5c96cae5f10078b580bcac1095899e1606f51

7 years agoRemoved unused method GetTexture form test-actor-utils.h 67/112167/1
Ferran Sole [Thu, 26 Jan 2017 16:54:02 +0000 (16:54 +0000)]
Removed unused method GetTexture form test-actor-utils.h

Change-Id: Ie25c441c32cd632834c3d9ef2c412d0f16cbae71

7 years agoRemoved unneeded includes of Dali::Atlas 06/111906/2
Ferran Sole [Tue, 24 Jan 2017 17:34:25 +0000 (17:34 +0000)]
Removed unneeded includes of Dali::Atlas

Change-Id: Ibf4ef1bdfabcf1c39a8350d997c80f1895485bec

7 years agoMerge "Add C# tooltip example to the control dashboard" into devel/master
Adeel Kazmi [Wed, 25 Jan 2017 11:53:34 +0000 (03:53 -0800)]
Merge "Add C# tooltip example to the control dashboard" into devel/master

7 years agoAdd C# tooltip example to the control dashboard 04/111904/3
Richard Huang [Tue, 24 Jan 2017 17:01:36 +0000 (17:01 +0000)]
Add C# tooltip example to the control dashboard

Change-Id: I1c96eb3b3ab73a257179d42901cce8b258283b54

7 years agoMerge "Doxygen Comment Generation" into devel/master
Adeel Kazmi [Tue, 24 Jan 2017 16:48:26 +0000 (08:48 -0800)]
Merge "Doxygen Comment Generation" into devel/master

7 years agoMerge "Add C# binding for ItemView." into devel/master
Adeel Kazmi [Tue, 24 Jan 2017 16:33:25 +0000 (08:33 -0800)]
Merge "Add C# binding for ItemView." into devel/master

7 years agoManual binding for Visual and Tooltip properties in devel-api 97/111897/1
Richard Huang [Tue, 24 Jan 2017 14:22:20 +0000 (14:22 +0000)]
Manual binding for Visual and Tooltip properties in devel-api

Change-Id: Ieb15d58401d5c11cf474880af62ce6e663ad64ad

7 years agoMerge "(GCC 6.2) Remove unused functions from automated-tests" into devel/master
Kimmo Hoikka [Tue, 24 Jan 2017 10:24:57 +0000 (02:24 -0800)]
Merge "(GCC 6.2) Remove unused functions from automated-tests" into devel/master

7 years ago(GCC 6.2) Remove unused functions from automated-tests 03/111503/2
Adeel Kazmi [Fri, 20 Jan 2017 18:09:45 +0000 (18:09 +0000)]
(GCC 6.2) Remove unused functions from automated-tests

Change-Id: Ic822c180d18758f74f77d6987815f3ccfc8f8dcc

7 years agoText - Use the uColor uniform to render the emojis. 61/111661/1
Victor Cebollada [Mon, 23 Jan 2017 08:54:50 +0000 (08:54 +0000)]
Text - Use the uColor uniform to render the emojis.

* Allows to mix the emoji color with a given color.
  i.e. a different alpha.

Change-Id: If8b3a4eecf2dc65785afd3aafbe03c485ac0d444
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
7 years agoDoxygen Comment Generation 99/92499/12
puru [Mon, 9 Jan 2017 14:39:37 +0000 (20:09 +0530)]
Doxygen Comment Generation

This patch includes scripts which automatically generates .i files,
to include for doxygen comment generation.

Change-Id: Iae1014f78e4a3ec4da9c282f190ec32e4257c2ea
Signed-off-by: puru <puru.dharma@samsung.com>
7 years agoMerge "Fix for ItemView OVERSHOOT_SIZE" into devel/master
Adeel Kazmi [Fri, 20 Jan 2017 13:57:53 +0000 (05:57 -0800)]
Merge "Fix for ItemView OVERSHOOT_SIZE" into devel/master

7 years agoDALi Version 1.2.23 87/111487/1 dali_1.2.23
Richard Huang [Fri, 20 Jan 2017 13:35:44 +0000 (13:35 +0000)]
DALi Version 1.2.23

Change-Id: I796b221c5a0f66b643f2ab095dc673bd6c798aeb

7 years agoFix for ItemView OVERSHOOT_SIZE 32/111132/5
Ferran Sole [Thu, 19 Jan 2017 11:58:46 +0000 (11:58 +0000)]
Fix for ItemView OVERSHOOT_SIZE

Setting overshoot size after overshoot was enabled was not working

Change-Id: Ibb7cc6268f85aa68aa5476b8a99222abab6f6525

7 years agoMerge "Fixed test cases after changes in ResourceImage" into devel/master
Paul Wisbey [Fri, 20 Jan 2017 09:19:25 +0000 (01:19 -0800)]
Merge "Fixed test cases after changes in ResourceImage" into devel/master

7 years agoMerge "Remove deprecated SetSelected call" into devel/master
Adeel Kazmi [Thu, 19 Jan 2017 16:35:08 +0000 (08:35 -0800)]
Merge "Remove deprecated SetSelected call" into devel/master

7 years agoMerge "Added TextVisual function to convert string keys to index keys in Property...
David Steele [Thu, 19 Jan 2017 12:59:07 +0000 (04:59 -0800)]
Merge "Added TextVisual function to convert string keys to index keys in Property Map" into devel/master

7 years agoRemove deprecated SetSelected call 89/111089/1
Agnelo Vaz [Thu, 19 Jan 2017 10:52:02 +0000 (10:52 +0000)]
Remove deprecated SetSelected call

Change-Id: I85755f56734e21fab3e68e89c448e0af5fdfc728

7 years agoAdd C# binding for ItemView. 68/111068/1
Feng Jin [Thu, 19 Jan 2017 09:30:32 +0000 (17:30 +0800)]
Add C# binding for ItemView.

Change-Id: Ieac38f99dbeb6656fc1a57cf39751dc1f2c6d7b3
Signed-off-by: Feng Jin <feng16.jin@samsung.com>
7 years agoAdd assert to ensure initialized variables. 32/110932/1
Francisco Santos [Wed, 18 Jan 2017 18:55:25 +0000 (18:55 +0000)]
Add assert to ensure initialized variables.

Change-Id: I46b75f9d7b6dd18aefebce845acbb7a46d258ffc

7 years agoAdded TextVisual function to convert string keys to index keys in Property Map 42/110742/6
Agnelo Vaz [Wed, 18 Jan 2017 14:17:59 +0000 (14:17 +0000)]
Added TextVisual function to convert string keys to index keys in Property Map

Fixes issue in which a PropertyMap made up of string keys would not merged into a PropertyMap made of Index keys. Instead it will have entries for both. The Visual Factory will only use Indexes to create the TextVisual hence the Properties set with strings are ignored.

Change-Id: I0bf2495d96ce86616a70d9de544dfe9768db40d7

7 years agoRemove usage of deprecated Button::SetLabelText 96/110896/2
Adeel Kazmi [Wed, 18 Jan 2017 12:07:48 +0000 (12:07 +0000)]
Remove usage of deprecated Button::SetLabelText

Change-Id: Ib82cf26ecd384f987e6567353fc7984e8781c19f

7 years agoFixed test cases after changes in ResourceImage 01/110701/2
Ferran Sole [Tue, 17 Jan 2017 12:38:59 +0000 (12:38 +0000)]
Fixed test cases after changes in ResourceImage

Change-Id: I73a428bda2db70f9b0827fed5b56a9b3d9f9e289

7 years agoMerge "Fix bug that the properties of layouts are set after the call of ItemView...
Adeel Kazmi [Tue, 17 Jan 2017 10:49:50 +0000 (02:49 -0800)]
Merge "Fix bug that the properties of layouts are set after the call of ItemView::ActivateLayout() function." into devel/master

7 years agoMerge "Wrap mode support for AnimatedImageVisual" into devel/master
Adeel Kazmi [Mon, 16 Jan 2017 17:07:00 +0000 (09:07 -0800)]
Merge "Wrap mode support for AnimatedImageVisual" into devel/master

7 years agoWrap mode support for AnimatedImageVisual 84/105484/6
Xiangyin Ma [Fri, 16 Dec 2016 16:15:21 +0000 (16:15 +0000)]
Wrap mode support for AnimatedImageVisual

Change-Id: If7fdddf3d833a13888a810a218cc5da2d89fd771

7 years agoMerge "TextVisual shows text after being Disabled and Enabled" into devel/master
Adeel Kazmi [Mon, 16 Jan 2017 15:27:46 +0000 (07:27 -0800)]
Merge "TextVisual shows text after being Disabled and Enabled" into devel/master

7 years agoMerge "Pass page up/down directions to layout controls for keyboard focus handling...
Minho Sun [Mon, 16 Jan 2017 10:36:47 +0000 (02:36 -0800)]
Merge "Pass page up/down directions to layout controls for keyboard focus handling" into devel/master

7 years agochange SINCE version of MoveFocusBackward 57/110357/1
minho.sun [Mon, 16 Jan 2017 05:18:13 +0000 (14:18 +0900)]
change SINCE version of MoveFocusBackward

MoveFocusBackward api merged at 1.2.19 but SINCE version was 1.2.17
To fix this, change SINCE version of MoveFocusBackward to 1.2.19

Change-Id: I38716eab6005101d1f5db9e43d14cc129b640ecc
Signed-off-by: minho.sun <minho.sun@samsung.com>
7 years agoFix bug that the properties of layouts are set after the call of ItemView::ActivateLa... 36/110336/1
Feng Jin [Sun, 15 Jan 2017 23:07:40 +0000 (07:07 +0800)]
Fix bug that the properties of layouts are set after the call of ItemView::ActivateLayout() function.

Change-Id: I91e424b86c0e13125e5cd3b2b9fb0138f798b77d
Signed-off-by: Feng Jin <feng16.jin@samsung.com>
7 years agoTextVisual shows text after being Disabled and Enabled 86/110286/4
Agnelo Vaz [Fri, 13 Jan 2017 13:40:43 +0000 (13:40 +0000)]
TextVisual shows text after being Disabled and Enabled

Disabling TextVisual then enabling it ( Set on and off stage ) did not show the Visual.

Textures were not set to renderer as considered not required

Change-Id: Iedf5f91afce6e6a1fa3f4c784682bbcab3787d9c

7 years agoMerge "DALi Version 1.2.22" into devel/master
David Steele [Fri, 13 Jan 2017 14:37:15 +0000 (06:37 -0800)]
Merge "DALi Version 1.2.22" into devel/master

7 years agoDALi Version 1.2.22 93/110293/1 dali_1.2.22
David Steele [Fri, 13 Jan 2017 14:35:42 +0000 (14:35 +0000)]
DALi Version 1.2.22

Change-Id: I667830873668aea838c685db21c5233e3a45f394

7 years agoMerge "Added C# binding for properties in devel-api" into devel/master
Kimmo Hoikka [Fri, 13 Jan 2017 13:51:10 +0000 (05:51 -0800)]
Merge "Added C# binding for properties in devel-api" into devel/master

7 years agoMerge "Updated visual property animator to handle shader properties" into devel/master
Kimmo Hoikka [Fri, 13 Jan 2017 13:45:39 +0000 (05:45 -0800)]
Merge "Updated visual property animator to handle shader properties" into devel/master

7 years agoMerge "Updated visuals to add animatable mixColor property" into devel/master
Kimmo Hoikka [Fri, 13 Jan 2017 13:40:48 +0000 (05:40 -0800)]
Merge "Updated visuals to add animatable mixColor property" into devel/master

7 years agoMerge "Match the arguments type in 'max' function" into devel/master
Kimmo Hoikka [Fri, 13 Jan 2017 11:53:48 +0000 (03:53 -0800)]
Merge "Match the arguments type in 'max' function" into devel/master

7 years agoPass page up/down directions to layout controls for keyboard focus handling 58/110058/2
Richard Huang [Thu, 12 Jan 2017 16:04:42 +0000 (16:04 +0000)]
Pass page up/down directions to layout controls for keyboard focus handling

Change-Id: Ic109497772f3145608d30e83375aa494c8730f1f

7 years agoAdded C# binding for properties in devel-api 95/109795/5
Richard Huang [Wed, 11 Jan 2017 16:20:24 +0000 (16:20 +0000)]
Added C# binding for properties in devel-api

Change-Id: I954c9db04e69625a4acfe0c2babb31be3b884e07

7 years agoUpdated visual property animator to handle shader properties 88/109288/7
David Steele [Mon, 9 Jan 2017 19:17:59 +0000 (19:17 +0000)]
Updated visual property animator to handle shader properties

If the AnimateProperty() method cannot find the requested property
in the renderer, it now checks the shader. If it finds a registered
uniform, then it registers the same uniform on the renderer, and
sets up the appropriate transition.

Change-Id: I0f5ae27deec005f406d18ca9de28ed9cf57f96a3
Signed-off-by: David Steele <david.steele@samsung.com>
7 years agoUpdated visuals to add animatable mixColor property 58/105158/20
David Steele [Thu, 15 Dec 2016 20:30:19 +0000 (20:30 +0000)]
Updated visuals to add animatable mixColor property

Modified all visuals to add a mix color property, except
color visual, which already has one, and primitive visual,
which has such a property, but have moved it to register on
the renderer rather than the shader.

Color and Primitive visual will handle either MIX_COLOR key, using
their own key in preference to the base key.

The target mix color and property index is now held in the
Visual::Base impl class. The uniform registration is also done
in the base clas.

Added handling to control to enable setting or animating the
mix color through the style sheet.

Added a note to Internal::Control::CreateTransition() to warn that
no animation will be created if the control is not staged or the
visual is not enabled

Ensured the blend mode is set to the right value for the target
mix color when the transition finishes.

Change-Id: I3191da06098582f57f101a8a0139faa3b1fb3c80
Signed-off-by: David Steele <david.steele@samsung.com>
7 years agoMerge "Button needs a simple mechanism to set text label" into devel/master
Adeel Kazmi [Thu, 12 Jan 2017 18:58:03 +0000 (10:58 -0800)]
Merge "Button needs a simple mechanism to set text label" into devel/master

7 years agoButton needs a simple mechanism to set text label 96/109796/4
Agnelo Vaz [Wed, 11 Jan 2017 15:02:55 +0000 (15:02 +0000)]
Button needs a simple mechanism to set text label

Label property can now take just a string instead of a property map to create text visual

Change-Id: I027136406b852fc2de0c99c6a00b614c63bbe432

7 years agoC# Control factory / Registry 38/101938/19
Nick Holland [Wed, 7 Dec 2016 15:41:53 +0000 (15:41 +0000)]
C# Control factory / Registry

Allows controls to register themselves
with DALi type registry along with their
properties.

Once registered this allows DALi to load a
JSON file which can create C# controls and fill
in properties for that control.

See json-loader
and data-picker-using-json

Change-Id: I7f57722a5a7e30b7c85a732dc2077da7cf5809c7

7 years agoMatch the arguments type in 'max' function 59/109559/1
Seoyeon Kim [Tue, 10 Jan 2017 10:22:29 +0000 (19:22 +0900)]
Match the arguments type in 'max' function

- Fix the matching:
  'max(double, float)' -> 'max(double, double)'

Change-Id: I07a8737d2d1a3934b7588aa8d925dd2389455ef4
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
7 years agoUpdate doxygen comments 66/109466/1
Seoyeon Kim [Tue, 10 Jan 2017 05:19:34 +0000 (14:19 +0900)]
Update doxygen comments

- Fix the graph description in ItemView::RemoveItem()
- Add some descriptions in more detail, checked by LB

Change-Id: I98fb22b4b02830da42651c16e7dfe2bc207a5137
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
7 years agoReduce buttons font size in 720 style sheet 82/109282/1
Agnelo Vaz [Mon, 9 Jan 2017 12:02:15 +0000 (12:02 +0000)]
Reduce buttons font size in 720 style sheet

Change-Id: I9dd38495cbcb843e6e30907f8df5c8cdb05415a6

7 years agoMerge "Fix the warning log in Control causing the wrong position" into devel/master
Adeel Kazmi [Mon, 9 Jan 2017 10:05:45 +0000 (02:05 -0800)]
Merge "Fix the warning log in Control causing the wrong position" into devel/master

7 years agoMerge "Added nested TableView KeyboardFocus support" into devel/master
Adeel Kazmi [Fri, 6 Jan 2017 16:27:11 +0000 (08:27 -0800)]
Merge "Added nested TableView KeyboardFocus support" into devel/master

7 years agoMerge "DALi Version 1.2.21" into devel/master
Adeel Kazmi [Fri, 6 Jan 2017 14:18:34 +0000 (06:18 -0800)]
Merge "DALi Version 1.2.21" into devel/master