Seoyeon Kim [Fri, 20 Jan 2017 02:20:10 +0000 (11:20 +0900)]
Revert "[Tizen] Make all profile have mobile dali_toolkit_profile except tv"
This reverts commit
634c32c28423140b459214b546a695a75b80f88e.
Change-Id: Ia622e9b05d8a5baea6ced191c0d3fd14468a403c
Seoyeon Kim [Fri, 20 Jan 2017 02:19:21 +0000 (11:19 +0900)]
Revert "[Tizen] Match the arguments type in 'max' function"
This reverts commit
8291e49c793797380b613492950f1bf8213218f9.
Change-Id: If00b911f389c68a7a996a8acc4be364cab283a47
Seoyeon Kim [Tue, 10 Jan 2017 10:22:29 +0000 (19:22 +0900)]
[Tizen] 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>
Seoyeon Kim [Wed, 4 Jan 2017 06:57:50 +0000 (15:57 +0900)]
[Tizen] Make all profile have mobile dali_toolkit_profile except tv
This reverts commit
61ab952ad70e20d6e4230ceb455e32e915d1a32d.
Change-Id: Ie6468ee418878c4f57dfefbc0796aabfa4ea7329
Seoyeon Kim [Wed, 4 Jan 2017 06:56:01 +0000 (15:56 +0900)]
[Tizen] Remove dead distance-field-effect.cpp file
This reverts commit
e2cff7af8956ffa22ad1d575a9369370b905fa71.
Change-Id: I8734c64b5f23986689b7621bb5faf834ac32c2cd
Seoyeon Kim [Wed, 4 Jan 2017 06:09:56 +0000 (15:09 +0900)]
Merge branch 'devel/master' into tizen
- Integration 1.2.18 -> 1.2.20 (Version up)
Change-Id: I3104bc41564c340e5dbb3155d27382222d8651e6
Seoyeon Kim [Wed, 4 Jan 2017 05:32:59 +0000 (14:32 +0900)]
Revert "[Tizen] Remove dead distance-field-effect.cpp file"
This reverts commit
656cfe838b08a5630ce29535be1fd038510e657a.
Change-Id: I1b862e4469c89b52fa2d99f69866d51e4726fe0e
Seoyeon Kim [Wed, 4 Jan 2017 05:31:58 +0000 (14:31 +0900)]
Revert "[Tizen] Make all profile have mobile dali_toolkit_profile except tv"
This reverts commit
57773126ea045d449ffb3b4ff6c2428b477592df.
Change-Id: I8858d70667e88d42ac0812f5974d68b8b4e9ed0d
Seoyeon Kim [Wed, 4 Jan 2017 05:30:58 +0000 (14:30 +0900)]
Revert "[Tizen] Deprecate the public APIs taking Image Handle as input"
This reverts commit
415171d54ef044102b87709d18088fa80799faf2.
Change-Id: I86e30b2f79302535746091cc049e3d527b3289a6
Seoyeon Kim [Wed, 4 Jan 2017 05:29:46 +0000 (14:29 +0900)]
Revert "[Tizen] Temporary disable c# GBS building"
This reverts commit
2002fe317d16add2119843891cc0923c50b54e8e.
Change-Id: I52c825ea556b4533c50a567fd3b5b96643a95925
Adeel Kazmi [Fri, 30 Dec 2016 10:45:38 +0000 (10:45 +0000)]
DALi Version 1.2.20
Change-Id: Icdb1c0dd8f150aa5bd9eb5d08ace47e606982c95
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
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
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>
Minho Sun [Mon, 26 Dec 2016 05:28:13 +0000 (21:28 -0800)]
Merge "Add push-button sample for dashboard" into devel/master
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
Adeel Kazmi [Fri, 23 Dec 2016 11:24:09 +0000 (11:24 +0000)]
Fixed various SVACE errors
Change-Id: Icaf45c9905770ad344c591f6a0f7ae9ed032e225
Adeel Kazmi [Fri, 23 Dec 2016 11:15:35 +0000 (03:15 -0800)]
Merge "Added Tooltip functionality to Control" 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
Adeel Kazmi [Wed, 7 Dec 2016 10:45:58 +0000 (10:45 +0000)]
Added Tooltip functionality to Control
Change-Id: I49fbb96bd31d3cf3cb06f959a8e4e380ba4b7120
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>
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>
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
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>
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
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
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
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
Paul Wisbey [Fri, 16 Dec 2016 15:10:30 +0000 (07:10 -0800)]
Merge "Text - Fix for placement actor." 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
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>
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
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
Adeel Kazmi [Fri, 16 Dec 2016 13:48:38 +0000 (13:48 +0000)]
Fix SVACE error in KeyboardFocusManager
Change-Id: I3655d30201f7e4554cb3b7a141c84b62b1270d97
Adeel Kazmi [Fri, 16 Dec 2016 13:34:06 +0000 (05:34 -0800)]
Merge "DALi Version 1.2.19" into devel/master
Francisco Santos [Fri, 16 Dec 2016 13:19:48 +0000 (13:19 +0000)]
DALi Version 1.2.19
Change-Id: I64a6b98b4c2dedc0a75dcdd05ebfe229b0958df8
Xiangyin Ma [Wed, 7 Dec 2016 15:49:35 +0000 (15:49 +0000)]
AnimatedImageVisual
Change-Id: I6d00000865b02fbdd1f47880e68b3b554da61d1c
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
Adeel Kazmi [Fri, 16 Dec 2016 09:17:38 +0000 (01:17 -0800)]
Merge "Add visuals group tag for doxygen" into devel/master
minho.sun [Fri, 16 Dec 2016 09:13:44 +0000 (01:13 -0800)]
Merge "C# control dashboard demo" into devel/master
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>
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
Umar [Thu, 15 Dec 2016 12:07:18 +0000 (12:07 +0000)]
Proper Fix for SWIG C# Build
Change-Id: I177b045fed213e3bc647fcaee400c179117fa4b6
minho.sun [Thu, 15 Dec 2016 05:43:41 +0000 (21:43 -0800)]
Merge "Add KeyboardFocus History Stack" into devel/master
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>
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
Adeel Kazmi [Wed, 14 Dec 2016 15:56:31 +0000 (07:56 -0800)]
Merge "Fix SWIG C# Build" into devel/master
Agnelo Vaz [Wed, 14 Dec 2016 15:31:28 +0000 (15:31 +0000)]
SVACE error in radio button
Change-Id: Iec23e69e66f0d3c256ac7995e1c71a55e9703aa4
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
Umar [Tue, 13 Dec 2016 15:51:56 +0000 (15:51 +0000)]
Fix SWIG C# Build
Change-Id: I08d596188d53ecc63b29fcd7d973436d76be2a89
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
suhyung Eom [Wed, 14 Dec 2016 02:05:45 +0000 (11:05 +0900)]
[Tizen] Temporary disable c# GBS building
Change-Id: I93f5971aca552aa6ec2057e5b2cec480c1d32ab8
suhyung Eom [Wed, 14 Dec 2016 01:27:54 +0000 (10:27 +0900)]
[Tizen] Deprecate the public APIs taking Image Handle as input
Change-Id: Ia63d6b5539ce8b040a249fb266b4b5e887dd6a3a
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
Agnelo Vaz [Tue, 13 Dec 2016 12:10:30 +0000 (12:10 +0000)]
TextVisual pixel aligned and uses new shader
Change-Id: I7736d9d605c995ace7fa4bc9bf5d1b8f7bb820cd
Agnelo Vaz [Mon, 12 Dec 2016 15:16:05 +0000 (15:16 +0000)]
Reducing 720 style sheets point size for buttons
Change-Id: I82acbd237b3412c04b51b84d3901215e2dfeda78
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
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
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
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
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
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
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
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
suhyung Eom [Tue, 13 Dec 2016 11:47:15 +0000 (20:47 +0900)]
[Tizen] Make all profile have mobile dali_toolkit_profile except tv
Change-Id: I915658278f4726d9e9e2f72f2036ea281e7b74e6
suhyung Eom [Tue, 13 Dec 2016 11:46:11 +0000 (20:46 +0900)]
[Tizen] Remove dead distance-field-effect.cpp file
Change-Id: I6474cd6f45fca5ecfd88012c371a57b0518de6dc
suhyung Eom [Tue, 13 Dec 2016 11:26:30 +0000 (03:26 -0800)]
Merge "Merge branch 'devel/master(1.2.18)' into tizen" into tizen
suhyung Eom [Tue, 13 Dec 2016 11:26:01 +0000 (03:26 -0800)]
Merge "Revert "[3.0] Make only dali-toolkit.spec file be used because of gbs build error"" into tizen
suhyung Eom [Tue, 13 Dec 2016 11:25:37 +0000 (03:25 -0800)]
Merge "Revert "[3.0] Remove dead distance-field-effect.cpp file"" into tizen
suhyung Eom [Tue, 13 Dec 2016 10:37:23 +0000 (19:37 +0900)]
Merge branch 'devel/master(1.2.18)' into tizen
Change-Id: I55c7a9122ed65b1beb882da42ffb7b2e520b08c0
suhyung Eom [Tue, 13 Dec 2016 10:35:28 +0000 (19:35 +0900)]
Revert "[3.0] Make only dali-toolkit.spec file be used because of gbs build error"
This reverts commit
5751507c893ea4cc1e2a52e84654b6362dd2a4c5.
Change-Id: I23c10860f66cde557703a0a94b9dd9c75b28dd1d
suhyung Eom [Tue, 13 Dec 2016 10:34:21 +0000 (19:34 +0900)]
Revert "[3.0] Remove dead distance-field-effect.cpp file"
This reverts commit
35736e1869854da921aa74d9ad1959917d7f510b.
Change-Id: I57a73254773aacca78f7d20975f1d36d07dbf3c5
suhyung Eom [Tue, 13 Dec 2016 08:39:27 +0000 (17:39 +0900)]
Revert "[3.0] Remove dead distance-field-effect.cpp file"
This reverts commit
35736e1869854da921aa74d9ad1959917d7f510b.
Change-Id: I1e6c6adfc68ba068047c413c04bd9686dd117990
suhyung Eom [Tue, 13 Dec 2016 08:38:38 +0000 (17:38 +0900)]
Revert "[3.0] Make all profile have mobile dali_toolkit_profile except tv"
This reverts commit
084a807c0d4890b828c407c97235e453cd93f88c.
Change-Id: If8b01dc10fb9c2c84872918c680cbca9dc2c132a
suhyung Eom [Tue, 13 Dec 2016 08:38:00 +0000 (17:38 +0900)]
Revert "[3.0] Update README for dali-swig"
This reverts commit
079d7b7a7dc7d162cbecda37b44a28fc029306df.
Change-Id: I6657bf08cbc1c5b080ce3c951a642198259d7f75
suhyung Eom [Tue, 13 Dec 2016 08:37:18 +0000 (17:37 +0900)]
Revert "[3.0]Deprecate the public APIs taking Image Handle as input"
This reverts commit
12bbda96f303bad1a6ae312118159ecd778fea77.
Change-Id: I9f15e3c494a9733efbfa23a700df4b618ec5b117
suhyung Eom [Tue, 13 Dec 2016 08:36:08 +0000 (17:36 +0900)]
Revert "[3.0] Temporary disable c# GBS building"
This reverts commit
a6cd25136092f7f32b7d711358b2dbe7630d7719.
Change-Id: I63dcf48832f802ca69f64a81ee3985bf2cecae64
suhyung Eom [Tue, 13 Dec 2016 08:34:41 +0000 (17:34 +0900)]
Revert "[3.0] (KeyboardFocusManager) Fixed ConnectSignal handling & SVACE error"
This reverts commit
63c3a7fbab95e9fe6ef276cdf06051302cedccdd.
Change-Id: I5dfb6af9f612843832930e3e879b8efd4010aa7b
dongsug song [Tue, 13 Dec 2016 04:30:10 +0000 (20:30 -0800)]
Merge "Revert "[3.0] Dali C# GBS build enabled"" into tizen
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
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
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
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>
Tom Robinson [Mon, 28 Nov 2016 12:01:01 +0000 (12:01 +0000)]
Visuals call SetProperties internally for 2-stage initialization
Change-Id: I7da559f150e09d51e88a0c94ee651f572da0d190
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>
Kimmo Hoikka [Fri, 9 Dec 2016 18:30:42 +0000 (10:30 -0800)]
Merge "Updating programming guide for control property registration" into devel/master
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>
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>
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
Adeel Kazmi [Fri, 9 Dec 2016 14:42:42 +0000 (06:42 -0800)]
Merge "DALi Version 1.2.18" into devel/master
Ferran Sole [Fri, 9 Dec 2016 14:34:54 +0000 (14:34 +0000)]
DALi Version 1.2.18
Change-Id: I1d1e17ea487710e68ae1ee8090200158ed05edef
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
Adeel Kazmi [Fri, 9 Dec 2016 11:49:55 +0000 (11:49 +0000)]
Fixed SVACE error in Internal::Visual::Base
Change-Id: I03ecbef0b08c41a275dab80d4b213d75f45c7019
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
Seoyeon Kim [Fri, 9 Dec 2016 06:40:33 +0000 (22:40 -0800)]
Merge "Add deprecated tag and missed doxygen" into devel/master
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>
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
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>
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
dongsug song [Tue, 6 Dec 2016 23:55:51 +0000 (15:55 -0800)]
Revert "[3.0] Dali C# GBS build enabled"
- to sync up with devel/master branch.
- new repository for dali-csharp-binder will be created.
This reverts commit
a10edf35216e89cd2b6a2d1fa131a9dcb2bdfc7d.
Change-Id: I75c9c36779ede18f0c04227f781d3a6495d66089