platform/core/uifw/dali-toolkit.git
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 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

7 years agoMerge "Automatic Control Clipping" into devel/master
Kimmo Hoikka [Fri, 6 Jan 2017 14:17:10 +0000 (06:17 -0800)]
Merge "Automatic Control Clipping" into devel/master

7 years agoMerge "Make Up calls to control consistent so they are called at the end by derived...
Kimmo Hoikka [Fri, 6 Jan 2017 14:16:46 +0000 (06:16 -0800)]
Merge "Make Up calls to control consistent so they are called at the end by derived classes" into devel/master

7 years agoDALi Version 1.2.21 44/109044/1 dali_1.2.21
Agnelo Vaz [Fri, 6 Jan 2017 14:01:14 +0000 (14:01 +0000)]
DALi Version 1.2.21

Change-Id: I52476e042889e12a65680f6af5b8a008ab7f8670

7 years agoAdded nested TableView KeyboardFocus support 43/106743/6
Umar [Thu, 22 Dec 2016 18:31:42 +0000 (18:31 +0000)]
Added nested TableView KeyboardFocus support

Change-Id: I108501a26b13a85efb2b71e7878b1580f0f06ea7

7 years agoAutomatic Control Clipping 95/108795/5
Adeel Kazmi [Fri, 30 Dec 2016 13:38:08 +0000 (13:38 +0000)]
Automatic Control Clipping

If the application sets to clip the children of a control, then this patch automatically
creates a background visual which is used for clipping the children rather than the
application writer having to do so.

It only adds the background visual if no renderers or visuals have been added.

Change-Id: I6e3c0c3c5459fc2cbc828daf3d01c7b0faf0a069

7 years agoMake Up calls to control consistent so they are called at the end by derived classes 97/107897/9
Adeel Kazmi [Fri, 30 Dec 2016 13:38:08 +0000 (13:38 +0000)]
Make Up calls to control consistent so they are called at the end by derived classes

- This makes the most sense in the majority of use cases and by defining this, it's an easy rule for
  control developers to follow.

Change-Id: Icb1701fbefcca70d8f81436b6d70a318e3e6fc76

7 years agoC#, Fixed ruby property script to remove trailing spaces 89/108689/2
Nick Holland [Thu, 5 Jan 2017 11:09:14 +0000 (11:09 +0000)]
C#, Fixed ruby property script to remove trailing spaces

Change-Id: I953453200d127fc98858007049fb7dd835196655

7 years agoWireframe visual provides correct natural size in debug rendering 03/108503/4
Xiangyin Ma [Wed, 4 Jan 2017 15:30:03 +0000 (15:30 +0000)]
Wireframe visual provides correct natural size in debug rendering

Change-Id: I34a5ebd57b467004a1c1b06c64f7a08f44a3a96f

7 years ago(ProgressBar) Ensure full progress image is shown when 100% 74/107774/3
Adeel Kazmi [Thu, 29 Dec 2016 17:03:27 +0000 (17:03 +0000)]
(ProgressBar) Ensure full progress image is shown when 100%

Before this patch, the track visual was always longer than the progress visual which meant
that 100% progress could never be shown.

Change-Id: I11fb81daf3b32096d0307904bff5a887311e0647

7 years agoMerge "Dali C#: Common Interface Define related changes" into devel/master
dongsug.song [Mon, 2 Jan 2017 01:06:40 +0000 (17:06 -0800)]
Merge "Dali C#: Common Interface Define related changes" into devel/master

7 years agoDali C#: Common Interface Define related changes 53/107353/4
dongsug.song [Tue, 27 Dec 2016 14:09:32 +0000 (23:09 +0900)]
Dali C#: Common Interface Define related changes

- AnimateBetween() API re-define, KeyFrames class Add() API re-define.
- Size3D (high level class) newly added.
- Vector2/3/4 class's variables => Pascal case naming changed.
- FocusManger: some naming which contained "Keyborad" changed.
- ImageView: sample code newly added, "PixelArea" property and AnimateBetween() are tested.
  image view reloading tested.
- Stage: single-tone pattern Instance property newly added. GetDefaultLayer(), AddLayer(),
  and RemoveLayer() are newly added. GetRootLayer(), Add() and Remove() will be moved to 'internal' folder.
  TouchEvent, WheelEvent, KeyEvent naming changed.
- Layer: Behavior property changed to use 'LayerBehavior enum' (not use string),
  MoveAbove() and MoveBelow() will be moved to 'internal' folder.
- Application: naming changed from AUIApplication to NUIApplication.
- SWIG build break: tooltip removed by property-wrapper.rb.
- miss spelling fixed (property).
- Animation enum value naming changed. add "name-changed.i". EndAction.Stop is changed to EndActions.StopFinal =>
  This is because, if I use 'EndAction' then the newly added 'EndAction property' has overlapped with enum itself.
  and if I use 'Stop' then the Stop() method's name is overlapped so SWIG doesn't generate Stop() method.

Change-Id: I519eb592e8d002fefa72b5bf78f830beae3f8d20
Signed-off-by: dongsug.song <dongsug.song@samsung.com>
7 years agoDALi Version 1.2.20 dali_1.2.20
Adeel Kazmi [Fri, 30 Dec 2016 10:45:38 +0000 (10:45 +0000)]
DALi Version 1.2.20

Change-Id: Icdb1c0dd8f150aa5bd9eb5d08ace47e606982c95

7 years agoFix the warning log in Control causing the wrong position 20/107820/1
Seoyeon Kim [Fri, 30 Dec 2016 04:38:42 +0000 (13:38 +0900)]
Fix the warning log in Control causing the wrong position

Change-Id: I8eee4d59970c3c1243e6155961089d7a085e75c1
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
7 years agoSuperBlurView bug fix: alpha uniform gets wrong value from constraint 40/106740/2
Xiangyin Ma [Thu, 22 Dec 2016 15:50:47 +0000 (15:50 +0000)]
SuperBlurView bug fix: alpha uniform gets wrong value from constraint

Change-Id: I4a0168b9c942e5a9d8b5d9b751ac29b4364f62ce

7 years agoStop using deprecated API from Popup and fix typo in Control 87/107587/1
Adeel Kazmi [Wed, 28 Dec 2016 14:11:44 +0000 (14:11 +0000)]
Stop using deprecated API from Popup and fix typo in Control

Change-Id: I8ff603aa1af813fa5e0bf614ebae815ddca7af6e

8 years agoAdd Popup and Toast example into dashboard. 87/106287/8
Feng [Wed, 21 Dec 2016 08:17:43 +0000 (16:17 +0800)]
Add Popup and Toast example into dashboard.

Change-Id: Ide3e53bbec252fb39e0908792b847d4201794de2
Signed-off-by: Feng <feng16.jin@samsung.com>
8 years agoMerge "Add push-button sample for dashboard" into devel/master
Minho Sun [Mon, 26 Dec 2016 05:28:13 +0000 (21:28 -0800)]
Merge "Add push-button sample for dashboard" into devel/master

8 years agoAdded po files for more languages 73/106973/1
suhyung Eom [Mon, 26 Dec 2016 04:39:07 +0000 (13:39 +0900)]
Added po files for more languages

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

8 years agoFixed various SVACE errors 93/106893/2
Adeel Kazmi [Fri, 23 Dec 2016 11:24:09 +0000 (11:24 +0000)]
Fixed various SVACE errors

Change-Id: Icaf45c9905770ad344c591f6a0f7ae9ed032e225

8 years agoMerge "Added Tooltip functionality to Control" into devel/master
Adeel Kazmi [Fri, 23 Dec 2016 11:15:35 +0000 (03:15 -0800)]
Merge "Added Tooltip functionality to Control" into devel/master

8 years agoMerge "Dali C#: Common Interface Define related changes" into devel/master
dongsug.song [Fri, 23 Dec 2016 01:44:45 +0000 (17:44 -0800)]
Merge "Dali C#: Common Interface Define related changes" into devel/master

8 years agoAdded Tooltip functionality to Control 43/103143/10
Adeel Kazmi [Wed, 7 Dec 2016 10:45:58 +0000 (10:45 +0000)]
Added Tooltip functionality to Control

Change-Id: I49fbb96bd31d3cf3cb06f959a8e4e380ba4b7120

8 years agoDali C#: Common Interface Define related changes 12/105712/9
dongsug.song [Mon, 19 Dec 2016 07:41:22 +0000 (16:41 +0900)]
Dali C#: Common Interface Define related changes

- OnStage() : changed/added into property of 'IsStageOn{get;}', changed into internal.
- View class inherit : changed to inherit from Actor (previously, CustomActor).
- BackgroundImage, Background are moved to /internal/view.cs
  because these return Dali.Property class which needs to be hidden in Common-Interface.
- KeyboardFocusManager naming changed : FocusManager, only class name is changed. need to change signal's names also.
- KeyInputFocusManager : Instance property added.
- Stage : BackgroundColor, Size property return types are changed from Dali.Color, Dali.Size to Vector4, Vector2.
- Animation FinishedSignal : Event Handler has been changed to get only one argument. Event chaining enabled.
- Animation EndAction : naming is changed as 'Cancel' and 'Stop', Stop(action) argument changed. EndAction property added.
- Duration : set as Milli-second unit as default. (DurationMilliSecs: removed)
- AnimateTo : Animation API interface changed.
- Add user custom alphafunction : enable user defined simple custom alphafunction,
  add sample app "user-alphafunction.cs" how to define custom alphafunction and delegate
- hello-world.cs, user-alphafunction.cs have been changed.
- Dali build server error : break in dali-demo build, some rpm package get failed. remove dali csharp spec file.
- EventHandler pattern changed : .NET provided EventHandler used. Stage Wheel event is not working.
  (but EventProcessingFinished works when actual mouse wheel controled.) Stage's event property naming changed.

Change-Id: I0b5e1af8817c94f757ff7bf9e87bc850c4cbd50b
Signed-off-by: dongsug.song <dongsug.song@samsung.com>
8 years agoAdd support for ItemView layout customisation through properties. 48/100248/23
fengjin16 [Fri, 25 Nov 2016 11:22:22 +0000 (19:22 +0800)]
Add support for ItemView layout customisation through properties.

Change "SetLayoutProperties()" to non-virtual method.

Change-Id: I635ec472ee459518466d6d0f67df94166d7c4d80
Signed-off-by: fengjin16 <feng16.jin@samsung.com>
8 years agoRemove incorrect Deprecated warning from Internal::Control 94/106094/1
Adeel Kazmi [Tue, 20 Dec 2016 10:46:50 +0000 (10:46 +0000)]
Remove incorrect Deprecated warning from Internal::Control

This is called from OnChildAdd so a control doing the right thing will always see this warning.
Classes overriding this method will not show the wanring which is actually the incorrect thing.

Best to just remove it as it's polluting the log.

Change-Id: I8509f14b75fd4e8e632f19f9487056454b4fba0c

8 years agoAdd push-button sample for dashboard 66/105966/2
xb.teng [Tue, 20 Dec 2016 06:26:08 +0000 (14:26 +0800)]
Add push-button sample for dashboard

Change-Id: I2635705861bc0f77a4212d9cd13d53d3de3f5c3b
Signed-off-by: xb.teng <xb.teng@samsung.com>
8 years agoMove virtual destructor same position as 2.4 63/105863/1
suhyung Eom [Tue, 20 Dec 2016 01:11:35 +0000 (10:11 +0900)]
Move virtual destructor same position as 2.4

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

8 years agoMove virtual destructor position to its original 93/105693/1
suhyung Eom [Fri, 16 Dec 2016 05:42:45 +0000 (14:42 +0900)]
Move virtual destructor position to its original

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

8 years agoAdd Page-UP/DOWN direction for KeyboardFocusManager 18/96518/4
suhyung Eom [Wed, 9 Nov 2016 04:48:18 +0000 (13:48 +0900)]
Add Page-UP/DOWN direction for KeyboardFocusManager

Add Page-Up/DOWN direction for KeyboardFocusManager.
This makes KeyboardFocusManager can move keyboard-focus towards the previous/next page direction.

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

8 years agoFix C# build break due to C++ property macro modification 81/105481/1
Nick Holland [Fri, 16 Dec 2016 17:32:17 +0000 (17:32 +0000)]
Fix C# build break due to C++ property macro modification

C# property generator script now strips out
any comments inserted after the property macro.

E.g. the following macro was breaking the script due to the // deprecated comment

DALI_PROPERTY_REGISTRATION( Toolkit, Button, "unselectedStateImage",               MAP,     UNSELECTED_STATE_IMAGE                ) // Deprecated property

Change-Id: Ifbbd45c71a44768c50d9bd2735d5aa0c5f4ddb7d

8 years agoMerge "Text - Fix for placement actor." into devel/master
Paul Wisbey [Fri, 16 Dec 2016 15:10:30 +0000 (07:10 -0800)]
Merge "Text - Fix for placement actor." into devel/master

8 years agoMerge "Fix SVACE error in KeyboardFocusManager" into devel/master
David Steele [Fri, 16 Dec 2016 15:08:44 +0000 (07:08 -0800)]
Merge "Fix SVACE error in KeyboardFocusManager" into devel/master

8 years agoText - Fix for placement actor. 52/104852/3
Victor Cebollada [Wed, 14 Dec 2016 07:10:22 +0000 (07:10 +0000)]
Text - Fix for placement actor.

* Aligns the placement actor within the text control according with the alignment properties.

Change-Id: I62782283d13195081b56d395eecb854eb30f1df9
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
8 years agoMerge "Fix TableView::GetNextKeyboardFocusableActor function by returning a valid...
Adeel Kazmi [Fri, 16 Dec 2016 13:58:34 +0000 (05:58 -0800)]
Merge "Fix TableView::GetNextKeyboardFocusableActor function by returning a valid actor in a given direction." into devel/master

8 years agoMerge changes I6d000008,Ibca83786 into devel/master
Adeel Kazmi [Fri, 16 Dec 2016 13:58:14 +0000 (05:58 -0800)]
Merge changes I6d000008,Ibca83786 into devel/master

* changes:
  AnimatedImageVisual
  (ImageAtlas) Add method for packing a group of pixelData into atlas

8 years agoFix SVACE error in KeyboardFocusManager 66/105466/1
Adeel Kazmi [Fri, 16 Dec 2016 13:48:38 +0000 (13:48 +0000)]
Fix SVACE error in KeyboardFocusManager

Change-Id: I3655d30201f7e4554cb3b7a141c84b62b1270d97

8 years agoMerge "DALi Version 1.2.19" into devel/master
Adeel Kazmi [Fri, 16 Dec 2016 13:34:06 +0000 (05:34 -0800)]
Merge "DALi Version 1.2.19" into devel/master

8 years agoDALi Version 1.2.19 46/105446/1 dali_1.2.19
Francisco Santos [Fri, 16 Dec 2016 13:19:48 +0000 (13:19 +0000)]
DALi Version 1.2.19

Change-Id: I64a6b98b4c2dedc0a75dcdd05ebfe229b0958df8

8 years agoAnimatedImageVisual 35/103235/11
Xiangyin Ma [Wed, 7 Dec 2016 15:49:35 +0000 (15:49 +0000)]
AnimatedImageVisual

Change-Id: I6d00000865b02fbdd1f47880e68b3b554da61d1c

8 years ago(ImageAtlas) Add method for packing a group of pixelData into atlas 30/102430/10
Xiangyin Ma [Mon, 5 Dec 2016 18:38:43 +0000 (18:38 +0000)]
(ImageAtlas) Add method for packing a group of pixelData into atlas

Change-Id: Ibca837868795cbfe951c5805a930af51f0f2c2c9

8 years agoMerge "Add visuals group tag for doxygen" into devel/master
Adeel Kazmi [Fri, 16 Dec 2016 09:17:38 +0000 (01:17 -0800)]
Merge "Add visuals group tag for doxygen" into devel/master

8 years agoMerge "C# control dashboard demo" into devel/master
minho.sun [Fri, 16 Dec 2016 09:13:44 +0000 (01:13 -0800)]
Merge "C# control dashboard demo" into devel/master

8 years agoAdd visuals group tag for doxygen 64/105264/1
Seoyeon Kim [Fri, 16 Dec 2016 06:36:53 +0000 (15:36 +0900)]
Add visuals group tag for doxygen

Change-Id: Iafd4f3a25113b890e0f01adab4d52d6b584efd97
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
8 years agoMerge "Updated control transitions to work with visual transform" into devel/master
Adeel Kazmi [Thu, 15 Dec 2016 16:01:36 +0000 (08:01 -0800)]
Merge "Updated control transitions to work with visual transform" into devel/master

8 years agoProper Fix for SWIG C# Build 19/105119/1
Umar [Thu, 15 Dec 2016 12:07:18 +0000 (12:07 +0000)]
Proper Fix for SWIG C# Build

Change-Id: I177b045fed213e3bc647fcaee400c179117fa4b6

8 years agoMerge "Add KeyboardFocus History Stack" into devel/master
minho.sun [Thu, 15 Dec 2016 05:43:41 +0000 (21:43 -0800)]
Merge "Add KeyboardFocus History Stack" into devel/master

8 years agoUpdated control transitions to work with visual transform 42/104842/3
David Steele [Wed, 2 Nov 2016 19:33:03 +0000 (19:33 +0000)]
Updated control transitions to work with visual transform

Modified Transform::SetPropertyMap() to handle string keys
( for styled transitions that set initial values )

Added GetRenderer to Internal::Visual::Base (not public)
( To allow control to access renderer's registered properties )

Changed Control::Impl::GetVisualProperty to ignore actor properties
and instead only use renderer properties. ( Allows transform::size
to be accessed )

Ensured RegisterVisual automatically names un-named visuals to
match the name of the property they are associated with. (This
makes it easy to wire up styled transitions to visuals).

Added a new method AddTransitions() to Internal::Control. This
enables the styled transition framework to add multiple animators
to a single animation. (slightly controversial - this is a new
public API, which should be a Devel API, but is really hard to
implement - an alternative approach is currently being looked at,
on which this may have to be rebased.

Change-Id: Ia3a1365594a1367fec9af09b9481f8696aef1d76
Signed-off-by: David Steele <david.steele@samsung.com>
8 years agoMerge changes Iec23e69e,I6437eab9 into devel/master
Adeel Kazmi [Wed, 14 Dec 2016 16:16:42 +0000 (08:16 -0800)]
Merge changes Iec23e69e,I6437eab9 into devel/master

* changes:
  SVACE error in radio button
  Ensure toggle button emits clicked signal when changing state

8 years agoMerge "Fix SWIG C# Build" into devel/master
Adeel Kazmi [Wed, 14 Dec 2016 15:56:31 +0000 (07:56 -0800)]
Merge "Fix SWIG C# Build" into devel/master

8 years agoSVACE error in radio button 08/104908/1
Agnelo Vaz [Wed, 14 Dec 2016 15:31:28 +0000 (15:31 +0000)]
SVACE error in radio button

Change-Id: Iec23e69e66f0d3c256ac7995e1c71a55e9703aa4

8 years agoFix TableView::GetNextKeyboardFocusableActor function by returning a valid actor... 96/104596/2
Umar [Tue, 13 Dec 2016 18:08:25 +0000 (18:08 +0000)]
Fix TableView::GetNextKeyboardFocusableActor function by returning a valid actor in a given direction.

Change-Id: I066dff41dadbfabc556f1a01637951a25821f5d4

8 years agoFix SWIG C# Build 89/104589/2
Umar [Tue, 13 Dec 2016 15:51:56 +0000 (15:51 +0000)]
Fix SWIG C# Build

Change-Id: I08d596188d53ecc63b29fcd7d973436d76be2a89

8 years agoEnsure toggle button emits clicked signal when changing state 65/104865/1
Agnelo Vaz [Wed, 14 Dec 2016 10:30:11 +0000 (10:30 +0000)]
Ensure toggle button emits clicked signal when changing state

Change-Id: I6437eab978eb89bcc1f56671ed49b079ec602a6c

8 years agoTextVisual no longer uses Atlas 78/104578/2
Agnelo Vaz [Tue, 13 Dec 2016 14:32:41 +0000 (14:32 +0000)]
TextVisual no longer uses Atlas

Seems the texture atlas has an offset whilst packing with is propagating a pixel alignment error

Change-Id: I3f1e362ee94baf7e86b42c370ac70053d8d38a7c

8 years agoTextVisual pixel aligned and uses new shader 39/104539/2
Agnelo Vaz [Tue, 13 Dec 2016 12:10:30 +0000 (12:10 +0000)]
TextVisual pixel aligned and uses new shader

Change-Id: I7736d9d605c995ace7fa4bc9bf5d1b8f7bb820cd

8 years agoReducing 720 style sheets point size for buttons 00/104200/2
Agnelo Vaz [Mon, 12 Dec 2016 15:16:05 +0000 (15:16 +0000)]
Reducing 720 style sheets point size for buttons

Change-Id: I82acbd237b3412c04b51b84d3901215e2dfeda78

8 years agoRemoving default background from TextField Popup buttons 46/103546/8
Agnelo Vaz [Thu, 8 Dec 2016 14:47:04 +0000 (14:47 +0000)]
Removing default background from TextField Popup buttons

Updating style files

Change-Id: Icb23db3a2ec2c82421e38831e03d3a92047a8702

8 years agoKeep legacy look of buttons with pre Visual API 45/103545/6
Agnelo Vaz [Thu, 8 Dec 2016 14:25:43 +0000 (14:25 +0000)]
Keep legacy look of buttons with pre Visual API

Change-Id: Ief4e1bb2bb3efe0871d86d4aae7c503e1e2708b0

8 years agoAdding button-devel.h and deprecation updates 52/101952/8
Agnelo Vaz [Fri, 2 Dec 2016 11:51:43 +0000 (11:51 +0000)]
Adding button-devel.h and deprecation updates

Removing new visuals from public api
Adding Label and Visual padding to Button devel api

Change-Id: Ib6d790f8821cc74306baa237c78a0fa4b6e4a77c

8 years agoText Selection popup to use Enums not string for Text 32/102432/5
Agnelo Vaz [Mon, 5 Dec 2016 18:54:24 +0000 (18:54 +0000)]
Text Selection popup to use Enums not string for Text

Change-Id: I5053551ce95087cb212a9610f72eee8aab817c73

8 years agoButton Upgrade to use Text Visual 06/99406/11
Agnelo Vaz [Thu, 17 Nov 2016 12:04:46 +0000 (12:04 +0000)]
Button Upgrade to use Text Visual

Fixing Autorepeat logic and Label Property setting with Keys.
Fix SetSelected bug when not OnStage and Removing cyclic relayout bug
Setting SetSelected to true before control staged would not remove old visuals before showing selected visuals, fixed.
Relayout was calling a function which itself called RelayoutRequest
Text visual properties now merge, RegisterVisual sets enable
Using SetTransformAndSize API instead of SetProperty
fixing stylesheets
GetLabelText property fix
Common code to get Visual Property Maps
Fixed test case that was using TextLabel Property instead of TextVisual
Adding Text Visual enum to string entry
Fixing Incorrect application of text padding

Change-Id: I732361023d9c843badb6d0be3122b055ac40c6c4

8 years agoImplemented Deprecated GetSelectedImage and GetButtonImage 41/98741/14
Agnelo Vaz [Fri, 18 Nov 2016 11:33:02 +0000 (11:33 +0000)]
Implemented Deprecated GetSelectedImage and GetButtonImage

Previously just returned an empty Actor but now returns a ImageView created from the Visual url.
SetSelectedImage and SetButtonImage fixed to return an Actor and parameter as Image to now break API.
Removed commented out code

Change-Id: I39edfc5200a8617fb3a2fc8a8576595ae7593dcd

8 years agoRemoved OnButton virtual functions and simplified RadioButton logic 94/98194/13
Agnelo Vaz [Tue, 15 Nov 2016 16:54:49 +0000 (16:54 +0000)]
Removed OnButton virtual functions and simplified RadioButton logic

OnButtonUp replaced with ToggleReleased, allows RadioButton to override part of OnButtonUp behaviour, still sends signals.
Comments updated after review comments.
Remove unused code including Virtual internal functions from Buttons

Change-Id: Ia0937aedd01405d1b66265e4f8bdbf613c98dd0a

8 years agoButtons to use Visuals 35/73035/37
Agnelo Vaz [Wed, 25 May 2016 13:26:50 +0000 (14:26 +0100)]
Buttons to use Visuals

Button base case takes over more of the functionality of derived class.
Visuals are now used istead of images.
Dali error added to Builder to be shown if string from json not found

Button Relayout optimised and aligns in 4 directions

Text can be aligned against the foreground using BEGIN, END, TOP and BOTTOM

Positioning of Text and Foreground visual optimised although text not centers if foreground visual present

Button uses visuals instead of placement actors

Tests for Button Visuals and Visual removal with empty map

Allow StageDisconnection to handle visual removal

debug header removed from button-impl.h and now in cpp files.
Fixed map bug in which map was checked for being empty before value was stored in it

Increasing coverage and Removing Internal Button Tests

Internal Tests used a TetButton when it should just use a PushButton.
The Internal tests did not offer any advantage over regular tests so removed.
Tests added to increase coverage and replace Internal tests
Added Wait function to test application

Change-Id: Idb9bccc9ca12a372c3e466fbdb4d8d3d41fb5acf

8 years agoApply deprecate macro and LOG 04/101504/5
suhyung Eom [Thu, 1 Dec 2016 09:22:39 +0000 (18:22 +0900)]
Apply deprecate macro and LOG

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

8 years agoFix code to match correct style, i.e. methods first 06/104206/1
Kimmo Hoikka [Mon, 12 Dec 2016 16:05:23 +0000 (16:05 +0000)]
Fix code to match correct style, i.e. methods first

Change-Id: I880471c51512fd36e947f9037e2924dc244f9872

8 years agoMerge "Text - TextClipper replaced by an Actor with the CLIPPING_MODE enabled." into...
Paul Wisbey [Mon, 12 Dec 2016 15:33:03 +0000 (07:33 -0800)]
Merge "Text - TextClipper replaced by an Actor with the CLIPPING_MODE enabled." into devel/master

8 years agoText - TextClipper replaced by an Actor with the CLIPPING_MODE enabled. 55/103555/3
Victor Cebollada [Thu, 8 Dec 2016 14:52:47 +0000 (14:52 +0000)]
Text - TextClipper replaced by an Actor with the CLIPPING_MODE enabled.

* Fixes issues with the inherited alpha channel.

Change-Id: I6a3f125d6de10d4d3d8673a6b340f05ae0edd3f6
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
8 years agoVisuals call SetProperties internally for 2-stage initialization 78/100578/7
Tom Robinson [Mon, 28 Nov 2016 12:01:01 +0000 (12:01 +0000)]
Visuals call SetProperties internally for 2-stage initialization

Change-Id: I7da559f150e09d51e88a0c94ee651f572da0d190

8 years agoC# control dashboard demo 48/101648/9
minho.sun [Fri, 2 Dec 2016 00:50:22 +0000 (09:50 +0900)]
C# control dashboard demo

To check control development process, all controls which we are planning
to make or upgrade should be on this app.

Please attach your controls on here.

And if you have any opinion about this dashboard app, feel free to
talk and change.

Change-Id: Icea04ccb1b802ef4f2b35859a3f3e1b04b26ce86
Signed-off-by: minho.sun <minho.sun@samsung.com>
8 years agoMerge "Updating programming guide for control property registration" into devel/master
Kimmo Hoikka [Fri, 9 Dec 2016 18:30:42 +0000 (10:30 -0800)]
Merge "Updating programming guide for control property registration" into devel/master

8 years agoUpdating programming guide for control property registration 79/102379/3
David Steele [Mon, 5 Dec 2016 12:30:27 +0000 (12:30 +0000)]
Updating programming guide for control property registration

There is nothing in the programming guide to indicate why the property
ranges of a derived control should start at a particular value.
Have updated the guides to describe this.

Change-Id: I04c0948dd8a306ce99128c92f97174c373f2817c
Signed-off-by: David Steele <david.steele@samsung.com>
8 years agoChanged flex container to selectively modify resize policy 76/103876/1
David Steele [Fri, 9 Dec 2016 16:38:58 +0000 (16:38 +0000)]
Changed flex container to selectively modify resize policy

Flex container currently sets the resize policy of all it's children to USE_ASSIGNED_SIZE, regardless of whether they are using flex child property or not.

Modified to only change resize policy when the flex child property is set.

Change-Id: Ifc6dce3022e48aef2b446b4e6cecde7b82ab73dc
Signed-off-by: David Steele <david.steele@samsung.com>
8 years agoMerge changes I7066e6c1,I3f0c228e into devel/master
Adeel Kazmi [Fri, 9 Dec 2016 16:41:14 +0000 (08:41 -0800)]
Merge changes I7066e6c1,I3f0c228e into devel/master

* changes:
  Implement default height for width and width for height for visuals and remove obsolete code from ImageView
  Stop unnecessary copying of property maps in ImageView::SetImage

8 years agoMerge "DALi Version 1.2.18" into devel/master
Adeel Kazmi [Fri, 9 Dec 2016 14:42:42 +0000 (06:42 -0800)]
Merge "DALi Version 1.2.18" into devel/master

8 years agoDALi Version 1.2.18 39/103839/1 dali_1.2.18
Ferran Sole [Fri, 9 Dec 2016 14:34:54 +0000 (14:34 +0000)]
DALi Version 1.2.18

Change-Id: I1d1e17ea487710e68ae1ee8090200158ed05edef

8 years agoImplement default height for width and width for height for visuals and remove obsole... 66/103566/2
Kimmo Hoikka [Thu, 8 Dec 2016 19:12:32 +0000 (19:12 +0000)]
Implement default height for width and width for height for visuals and remove obsolete code from ImageView

Change-Id: I7066e6c1456de146b80265c259e6f7f411268a3b

8 years agoFixed SVACE error in Internal::Visual::Base 92/103792/1
Adeel Kazmi [Fri, 9 Dec 2016 11:49:55 +0000 (11:49 +0000)]
Fixed SVACE error in Internal::Visual::Base

Change-Id: I03ecbef0b08c41a275dab80d4b213d75f45c7019

8 years agoStop unnecessary copying of property maps in ImageView::SetImage 27/103527/2
Kimmo Hoikka [Thu, 8 Dec 2016 13:37:41 +0000 (13:37 +0000)]
Stop unnecessary copying of property maps in ImageView::SetImage

Change-Id: I3f0c228e80478ea76a4cf8cdd1eaaf0702f0fcc5

8 years agoMerge "Add deprecated tag and missed doxygen" into devel/master
Seoyeon Kim [Fri, 9 Dec 2016 06:40:33 +0000 (22:40 -0800)]
Merge "Add deprecated tag and missed doxygen" into devel/master

8 years agoAdd deprecated tag and missed doxygen 08/99308/2
Seoyeon Kim [Tue, 22 Nov 2016 10:00:25 +0000 (19:00 +0900)]
Add deprecated tag and missed doxygen

- Add 'DEPRECATED_1_2_8' doxygen tag
- The doxygen warning log said some Property enumerations of class are not documented.

Change-Id: Ia39617bc2f3a64eb0f8d7de77ef547ae0ea4ee91
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
8 years agoAdded devel property PREMULTIPLIED_ALPHA ( "premultipliedAlpha" ). 12/102912/7
adam.b [Tue, 6 Dec 2016 17:56:56 +0000 (17:56 +0000)]
Added devel property PREMULTIPLIED_ALPHA ( "premultipliedAlpha" ).

The property enables/disables premultiplied alpha on the Visual.

Example:

control.SetProperty( Toolkit::Control::Property::BACKGROUND,
                     Property::Map().
                     Add( "premultipliedAlpha", true ));

Change-Id: I8c8af1b781109256e04f7f3806e9698b34bce40b

8 years agoText - Fix for text's cursor position. 46/103146/1
Victor Cebollada [Wed, 7 Dec 2016 10:42:36 +0000 (10:42 +0000)]
Text - Fix for text's cursor position.

* The control's size stored in the view-model is not updated
  when the text is void.
  If the text's alignment is not BEGIN, the cursor position
  is calculated badly.

Change-Id: I65f6c520268608ad1605fc2d0b70be96377bb9dd
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
8 years agoFixed svace defect 77/102977/1
suhyung Eom [Wed, 7 Dec 2016 02:28:33 +0000 (11:28 +0900)]
Fixed svace defect

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