platform/core/uifw/dali-toolkit.git
7 years ago[dali_1.2.47] Merge branch 'devel/master' 53/137753/1
Agnelo Vaz [Fri, 7 Jul 2017 10:21:19 +0000 (11:21 +0100)]
[dali_1.2.47] Merge branch 'devel/master'

Change-Id: I52ca97b1d74c8e0d6c26c16260ab32b89ca86a64

7 years agoDALi Version 1.2.47 49/137749/1 dali_1.2.47
Agnelo Vaz [Fri, 7 Jul 2017 10:20:35 +0000 (11:20 +0100)]
DALi Version 1.2.47

Change-Id: I0ee00c0c80470a7ee0ce4ccd7ec5ba44166a22ae

7 years agoFix for obj-loader 65/136665/7
Victor Cebollada [Fri, 30 Jun 2017 15:13:27 +0000 (16:13 +0100)]
Fix for obj-loader

* Fixes an invalid read reported by valgrind.
* Fix an posible overflow

Change-Id: I57ccebb986d209b8d4deba4819b4b3cac8aced24
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
7 years agoFix a popup position error caused by SetInheritPosition() change 53/136953/2
Heeyong Song [Tue, 4 Jul 2017 01:36:05 +0000 (10:36 +0900)]
Fix a popup position error caused by SetInheritPosition() change

Change-Id: I26e9a223a214111a6ae3d7f30fc2d79342b4b189

7 years agoSupported position/size for underlay video rendering 88/136388/15
taeyoon0.lee [Wed, 28 Jun 2017 15:29:40 +0000 (00:29 +0900)]
Supported position/size for underlay video rendering

 - Set updated video display area by constraint
 - Set video display area by blending of renderer

Change-Id: I3c230796a170cf99a1a0fc7df3e0d3af5010599b

7 years agoMerge "Modified video view impl by considering visual" into devel/master
taeyoon [Tue, 4 Jul 2017 03:14:49 +0000 (03:14 +0000)]
Merge "Modified video view impl by considering visual" into devel/master

7 years agoReplace registered visuals only when replacement is ready 76/135976/11
Agnelo Vaz [Tue, 27 Jun 2017 18:40:15 +0000 (19:40 +0100)]
Replace registered visuals only when replacement is ready

Replacing an image before the replacement has loaded was causing a flicker
Control now only sets the visual of stage when the replacement is resource ready

Change-Id: I24d04102c2f945ba2659d4f35e2eaf257b71c11b
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
7 years agoModified video view impl by considering visual 52/136352/7
taeyoon [Fri, 9 Sep 2016 10:09:40 +0000 (19:09 +0900)]
Modified video view impl by considering visual

 - modified rendering target and custom shader

Change-Id: I3f0d1082f4e210f23a2aec0524016bbc08b38ff5

7 years agoMerge "Implement Placeholder additional property" into devel/master
Seoyeon Kim [Mon, 3 Jul 2017 00:47:04 +0000 (00:47 +0000)]
Merge "Implement Placeholder additional property" into devel/master

7 years agoMerge "Fix a crash when the same image is set repeatedly" into devel/master
Adeel Kazmi [Fri, 30 Jun 2017 13:46:45 +0000 (13:46 +0000)]
Merge "Fix a crash when the same image is set repeatedly" into devel/master

7 years agoMerge "DALi Version 1.2.46" into devel/master
Adeel Kazmi [Fri, 30 Jun 2017 10:43:25 +0000 (10:43 +0000)]
Merge "DALi Version 1.2.46" into devel/master

7 years ago[dali_1.2.46] Merge branch 'devel/master' 15/136615/1
Adeel Kazmi [Fri, 30 Jun 2017 10:21:41 +0000 (11:21 +0100)]
[dali_1.2.46] Merge branch 'devel/master'

Change-Id: I3d0506b29bf71bc849a8ee3d60d8b7059108647d

7 years agoDALi Version 1.2.46 11/136611/1 dali_1.2.46
Adeel Kazmi [Fri, 30 Jun 2017 10:20:52 +0000 (11:20 +0100)]
DALi Version 1.2.46

Change-Id: I724f4103f6bbf589dab86bc0ddb34870d3976b0e

7 years agoImplement Placeholder additional property 48/133248/20
Seoyeon Kim [Fri, 9 Jun 2017 10:01:16 +0000 (19:01 +0900)]
Implement Placeholder additional property

- PLACEHOLDER property type is MAP :
  Text, Color, Font Family, Font Style, Point Size, and Pixel Size

Change-Id: If6d8d941865ebb0e21aa70830c3ac1981907bafb
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
7 years agoMerge "Added config section to stylesheet" into devel/master
minho.sun [Fri, 30 Jun 2017 07:34:10 +0000 (07:34 +0000)]
Merge "Added config section to stylesheet" into devel/master

7 years agoFix a crash when the same image is set repeatedly 90/136390/2
Heeyong Song [Thu, 29 Jun 2017 08:52:26 +0000 (17:52 +0900)]
Fix a crash when the same image is set repeatedly

Change-Id: I7a31401f8dc9b1fd1065d31be40e356839fbc6d4

7 years agoMerge "Add missing break statement in switch-case statements" into devel/master
Adeel Kazmi [Thu, 29 Jun 2017 10:10:00 +0000 (10:10 +0000)]
Merge "Add missing break statement in switch-case statements" into devel/master

7 years agoAdded config section to stylesheet 39/133139/8
minho.sun [Fri, 9 Jun 2017 05:01:25 +0000 (14:01 +0900)]
Added config section to stylesheet

Added config section to stylesheet.

User can set configuration for dali-toolkit via this section.

Currently, user can use only "alwaysShowFocus" which is for
KeyboardFocusManager.
( If true, shows focus indicator even if there is no KeyEvent. )

Change-Id: Iac2a6202c22a6026c63b3f42542c99341e73ad7b
Signed-off-by: minho.sun <minho.sun@samsung.com>
7 years agoRevert "Modified video view impl by considering visual" 51/136351/2
taeyoon0.lee [Thu, 29 Jun 2017 07:33:35 +0000 (16:33 +0900)]
Revert "Modified video view impl by considering visual"

One patch was merged by wrong way, so reverted

This reverts commit 79a69ab0b206ee0464a624077062e72f437bad98.

Change-Id: Ib3d55a0b23caf4040e5b3c3aa7640ea9e62a336e

7 years agoModified video view impl by considering visual
taeyoon [Fri, 9 Sep 2016 10:09:40 +0000 (19:09 +0900)]
Modified video view impl by considering visual

Change-Id: I3f0d1082f4e210f23a2aec0524016bbc08b38ff5

7 years agoAdd missing break statement in switch-case statements 64/136264/1
Seoyeon Kim [Thu, 29 Jun 2017 01:47:32 +0000 (10:47 +0900)]
Add missing break statement in switch-case statements

- In image-visual.cpp, some break statement is missing.

Change-Id: I378677aa888806f63c97cb6f68e81df5e3e1d3f3
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
7 years agoMerge "Changed image loaders to use new PixelBuffer class." into devel/master
Adeel Kazmi [Wed, 28 Jun 2017 15:00:57 +0000 (15:00 +0000)]
Merge "Changed image loaders to use new PixelBuffer class." into devel/master

7 years agoChanged image loaders to use new PixelBuffer class. 27/134927/9
David Steele [Tue, 20 Jun 2017 09:06:58 +0000 (10:06 +0100)]
Changed image loaders to use new PixelBuffer class.

Migrating from PixelData to PixelBuffer internally. Public API
still offers PixelData where needed.

Through DevelAPI, it is now possible to retrieve a PixelBuffer from
AsyncImageLoader.

Removed BitmapLoader usage in favour of LoadImageFromFile().

Change-Id: Ib9e7b96cb6d643c0fb13e24b598131a3642a4b7c
Signed-off-by: David Steele <david.steele@samsung.com>
7 years agoMerge "Add ENABLE_SELECTION property to TextField and TextEditor" into devel/master
Seoyeon Kim [Wed, 28 Jun 2017 08:20:25 +0000 (08:20 +0000)]
Merge "Add ENABLE_SELECTION property to TextField and TextEditor" into devel/master

7 years agoAdd ENABLE_SELECTION property to TextField and TextEditor 37/134337/8
Seoyeon Kim [Fri, 16 Jun 2017 05:06:01 +0000 (14:06 +0900)]
Add ENABLE_SELECTION property to TextField and TextEditor

- ENABLE_SELECTION property is to enable or disable the text selection and clipboard.

Change-Id: Iff778b4dc414415b83d04aff8bccdc2d8f3a93a3
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
7 years agoAdded custom vertex shader support for NinePatch 61/134961/5
devrajsinghchouhan [Tue, 20 Jun 2017 10:30:14 +0000 (16:00 +0530)]
Added custom vertex shader support for NinePatch

Change-Id: I42e9f5bcecf5dcea0bd20d37de8cbd8ddd2f9b5b
Signed-off-by: devrajsinghchouhan <devraj.singh@samsung.com>
Enable Custom Vertex Shader Support for NinePatch Visual.

7 years agoRemoved unused variable from 9-patch shader 68/114468/4
Paul Wisbey [Mon, 13 Feb 2017 11:02:31 +0000 (11:02 +0000)]
Removed unused variable from 9-patch shader

Change-Id: I26eee3590a4eecb1d61d79b941546317e7124803

7 years agoMerge "DALi Version 1.2.45" into devel/master
Adeel Kazmi [Fri, 23 Jun 2017 09:50:57 +0000 (09:50 +0000)]
Merge "DALi Version 1.2.45" into devel/master

7 years agoMerge "Add Text font size conversion description in documentation" into devel/master
Adeel Kazmi [Fri, 23 Jun 2017 09:49:52 +0000 (09:49 +0000)]
Merge "Add Text font size conversion description in documentation" into devel/master

7 years ago[dali_1.2.45] Merge branch 'devel/master' 12/135612/1
Victor Cebollada [Fri, 23 Jun 2017 09:44:48 +0000 (10:44 +0100)]
[dali_1.2.45] Merge branch 'devel/master'

Change-Id: Id1c741b4e25b5140581be8c5da1ff0b0be96022c

7 years agoDALi Version 1.2.45 08/135608/1 dali_1.2.45
Victor Cebollada [Fri, 23 Jun 2017 09:43:59 +0000 (10:43 +0100)]
DALi Version 1.2.45

Change-Id: I06813e9cba6bd9e70a7f5a04b1e7d43bf8d5dc6e

7 years agoMerge "Make TextEditor emit ScrollStateChangedSignal after ScrollBar creation" into...
minho.sun [Wed, 21 Jun 2017 05:06:09 +0000 (05:06 +0000)]
Merge "Make TextEditor emit ScrollStateChangedSignal after ScrollBar creation" into devel/master

7 years agoMerge "Fixed an error adding duplicate primary position.y" into devel/master
Jinho, Lee [Wed, 21 Jun 2017 01:30:00 +0000 (01:30 +0000)]
Merge "Fixed an error adding duplicate primary position.y" into devel/master

7 years agoFixed an error adding duplicate primary position.y 19/133319/9
Jinho, Lee [Fri, 9 Jun 2017 16:32:56 +0000 (01:32 +0900)]
Fixed an error adding duplicate primary position.y

In the target, characters with different glyph heights
(ex: Korean, English: "안녕하세요, hello") are written in same text field

when the character is deleted by one character,
the position of the TextField continuously goes down.

Change-Id: Ic44d79992eec67ae7ddec9e302c95877f90f2580

7 years agoMerge "Added GetTypeInfo to get registered type of a control wrapper" into devel...
Adeel Kazmi [Mon, 19 Jun 2017 12:16:39 +0000 (12:16 +0000)]
Merge "Added GetTypeInfo to get registered type of a control wrapper" into devel/master

7 years agoMerge "Fixed automatic naming of visuals for non-native controls" into devel/master
Adeel Kazmi [Mon, 19 Jun 2017 12:08:57 +0000 (12:08 +0000)]
Merge "Fixed automatic naming of visuals for non-native controls" into devel/master

7 years agoAdded GetTypeInfo to get registered type of a control wrapper 62/134462/2
David Steele [Thu, 15 Jun 2017 16:13:47 +0000 (17:13 +0100)]
Added GetTypeInfo to get registered type of a control wrapper

Added test case to show end-to-end registry setting and usage
(i.e. registering a property, registering a visual with that property
index, and using CreateTransition to check that the visual was correctly
named with the property name)

Change-Id: I216a2cbf0299557ac0eb91b5208b20a76f7dadeb

7 years agoMerge "Fixed texture-manager crash for async load complete" into devel/master
Adeel Kazmi [Fri, 16 Jun 2017 15:05:28 +0000 (15:05 +0000)]
Merge "Fixed texture-manager crash for async load complete" into devel/master

7 years agoFixed automatic naming of visuals for non-native controls 78/134278/2
David Steele [Thu, 15 Jun 2017 10:51:06 +0000 (11:51 +0100)]
Fixed automatic naming of visuals for non-native controls

Ensured Control::Background visual is named to "background" regardless.

During visual registration, a lookup of registered properties is attempted to
retrieve the name of the property and assign that name to the visual.
(Used by scripting and styling).

In the case of non-native controls, where they use ControlWrapper as
their gateway class, the typeid lookup cannot get past ControlWrapper,
so will currently fail to name the visuals.

Instead, changed the RegisterVisual method to call GetPropertyName() directly -
for the ControlWrapper case, the non-native type name has been set on this object,
and in the glue layer, any C# properties annotated with ScriptableProperties
will be registered with the same type name. Consequently, GetPropertyName() will
work as intended for non-native properties.

However, this has to be within a try-catch block, as it will assert if the
developer hasn't registered the property index, which is the case
for some native controls.

Change-Id: I8b92496a21d13e3696fb827e67586f92e9e0dffb
Signed-off-by: David Steele <david.steele@samsung.com>
7 years agoMerge "DALi Version 1.2.44" into devel/master
Adeel Kazmi [Fri, 16 Jun 2017 11:09:11 +0000 (11:09 +0000)]
Merge "DALi Version 1.2.44" into devel/master

7 years ago[dali_1.2.44] Merge branch 'devel/master' 37/134437/1
Umar [Fri, 16 Jun 2017 11:04:24 +0000 (12:04 +0100)]
[dali_1.2.44] Merge branch 'devel/master'

Change-Id: I413c5b422dc1ec23c1c267d8eb932434f88c1016

7 years agoDALi Version 1.2.44 32/134432/1 dali_1.2.44
Umar [Fri, 16 Jun 2017 11:03:43 +0000 (12:03 +0100)]
DALi Version 1.2.44

Change-Id: Ia567aeec4addef1d25095a9162d04b4063febe75

7 years agoFixed texture-manager crash for async load complete 21/133521/3
Nick Holland [Thu, 15 Jun 2017 16:26:21 +0000 (17:26 +0100)]
Fixed texture-manager crash for async load complete

Crash was found when testing with this patch:
https://review.tizen.org/gerrit/#/c/132804/

    Test patch adds ImageViews to the stage, during a ResourceReady()
    call back, which has come from an AsyncLoad complete from
    ImageViews already on the stage.

Change-Id: I5073804a3cc391c9984db62c54224442923c3afa

7 years agoMerge "Check character glyph index before using cached Font" into devel/master
Jinho, Lee [Fri, 16 Jun 2017 07:52:33 +0000 (07:52 +0000)]
Merge "Check character glyph index before using cached Font" into devel/master

7 years agoMake TextEditor emit ScrollStateChangedSignal after ScrollBar creation 69/134369/1
minho.sun [Fri, 16 Jun 2017 06:49:12 +0000 (15:49 +0900)]
Make TextEditor emit ScrollStateChangedSignal after ScrollBar creation

Make TextEditor emit ScrollStateChangedSignal after ScrollBar creation.

Change-Id: I94d495873c54fbe25b421da4622013ffc91a6c3c
Signed-off-by: minho.sun <minho.sun@samsung.com>
7 years agoAdd Text font size conversion description in documentation 71/134171/1
Seoyeon Kim [Thu, 15 Jun 2017 06:16:01 +0000 (15:16 +0900)]
Add Text font size conversion description in documentation

Change-Id: I5f48be95e95997947a39686e0b76bfa646e8eebb
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
7 years agoTurns pixel align off as default 63/134163/2
taeyoon0.lee [Thu, 15 Jun 2017 05:41:03 +0000 (14:41 +0900)]
Turns pixel align off as default

 - Now it causes issues in imageView and animation

Change-Id: Ib400864c443727c8186475cf6cfb9160b026c17e

7 years agoMerge "Fixups following changes to actor traversal" into devel/master
David Steele [Mon, 12 Jun 2017 15:31:11 +0000 (15:31 +0000)]
Merge "Fixups following changes to actor traversal" into devel/master

7 years agoFixups following changes to actor traversal 54/132954/5
David Steele [Thu, 8 Jun 2017 11:15:20 +0000 (12:15 +0100)]
Fixups following changes to actor traversal

Fixed popup (background actor was after content)
Fixed text editor/field (highlight was on top of text)

Change-Id: I6597989b0f9fc15f4d3a1929bac8c41fba303ffa

7 years agoTextureManager "if" clause error 18/133318/2
Agnelo Vaz [Fri, 9 Jun 2017 17:26:11 +0000 (18:26 +0100)]
TextureManager "if" clause error

Change-Id: Idba7a1601273a8689dbfd1db3c6fb827dd3e3d7e

7 years agoMerge "Updated ImageVisual to handle CPU Image Masking" into devel/master
Adeel Kazmi [Fri, 9 Jun 2017 12:53:58 +0000 (12:53 +0000)]
Merge "Updated ImageVisual to handle CPU Image Masking" into devel/master

7 years ago[dali_1.2.43] Merge branch 'devel/master' 90/133290/2
Adeel Kazmi [Fri, 9 Jun 2017 12:51:40 +0000 (13:51 +0100)]
[dali_1.2.43] Merge branch 'devel/master'

Change-Id: Ib0d6f756507484afb96aeddc8e7451acf95b24e8

7 years agoDALi Version 1.2.43 86/133286/1 dali_1.2.43
Richard Huang [Fri, 9 Jun 2017 12:23:23 +0000 (13:23 +0100)]
DALi Version 1.2.43

Change-Id: I776e419011db8b06db04c4cddb6d48279cc80522

7 years agoMerge "Added ScrollStateChangedSignal to TextEditor." into devel/master
Adeel Kazmi [Thu, 8 Jun 2017 14:05:04 +0000 (14:05 +0000)]
Merge "Added ScrollStateChangedSignal to TextEditor." into devel/master

7 years agoAdded ScrollStateChangedSignal to TextEditor. 92/132092/10
minho.sun [Thu, 1 Jun 2017 05:22:22 +0000 (14:22 +0900)]
Added ScrollStateChangedSignal to TextEditor.

Added ScrollStateChagnedSignal to TextEditor.

State : STARTED / FINISHED

When UpdateScrollBar() called, STARTED.
When ScrollBar indicator animation is stopped, FINISHED.

Change-Id: I66409fee2432958aa17b49c4f8025f93a010403f
Signed-off-by: minho.sun <minho.sun@samsung.com>
7 years agoCheck character glyph index before using cached Font 28/132928/1
Jinho, Lee [Thu, 8 Jun 2017 07:20:51 +0000 (16:20 +0900)]
Check character glyph index before using cached Font

CJK script use 3 fonts (chiniese. japanese, korean),
  (tizen TV has, BreezeSansChinese-Regular.ttf, BreezeSansJapanese-Regular.ttf, BreezeSansKorean-Regular.ttf)

Some CJK characters may not be included in these three fonts.
In this case, it need to search fallback font again.

Change-Id: I99ed74af3d53edd82e029331c51a8404238f7745

7 years agoFixed getting SCROLL_POSITION_INTERVALS Property bug in ScrollBar 86/132886/2
minho.sun [Thu, 8 Jun 2017 07:06:54 +0000 (16:06 +0900)]
Fixed getting SCROLL_POSITION_INTERVALS Property bug in ScrollBar

Fixed getting SCROLL_POSITION_INTERVALS Property bug in ScrollBar.

When getting SCROLL_POSITION_INTERVALS property via GetProperty, it
always return 0.

Make the result of GetProperty be same as GetScrollPositionInterval().

Change-Id: Ide7353ebfb82e80959f7a0834f98d4c05ccd201f
Signed-off-by: minho.sun <minho.sun@samsung.com>
7 years agoUpdated ImageVisual to handle CPU Image Masking 64/130964/8
David Steele [Mon, 27 Mar 2017 13:24:36 +0000 (14:24 +0100)]
Updated ImageVisual to handle CPU Image Masking

Updated ImageVisual to add a URL for an alpha mask image. If this is present
in the initialization map, then the mask is loaded and stored in CPU (it
may be used by other textures). On triggering the Async image loading in
TextureManager, the alpha mask's textureId can be passed in.

Added new state machine to TextureManager to handle loading a mask and
and an image; and to apply the mask to the image when both have loaded.

Image masks are applied in CPU side, so they are stored in CPU memory.
All other images are uploaded to GPU ( after optional mask has been applied )

Change-Id: I6cce7f62d6d6765dc6199bb25891791333533dea

7 years agoMerge "Remove profile build dependencies" into devel/master
Adeel Kazmi [Wed, 7 Jun 2017 10:03:33 +0000 (10:03 +0000)]
Merge "Remove profile build dependencies" into devel/master

7 years agoChange Visual depth index API from float to int 07/132507/1
Adeel Kazmi [Tue, 6 Jun 2017 09:59:17 +0000 (10:59 +0100)]
Change Visual depth index API from float to int

Change-Id: I08faedcf31235b3d5a62e5e6e44fcddd1c38e98e

7 years agoMerge "(Visuals) If depth index not specified, then visual depth indices are set...
Kimmo Hoikka [Tue, 6 Jun 2017 09:41:54 +0000 (09:41 +0000)]
Merge "(Visuals) If depth index not specified, then visual depth indices are set in order they are registered" into devel/master

7 years ago(Visuals) If depth index not specified, then visual depth indices are set in order... 74/132474/4
Adeel Kazmi [Mon, 5 Jun 2017 12:34:35 +0000 (13:34 +0100)]
(Visuals) If depth index not specified, then visual depth indices are set in order they are registered

Change-Id: I720bbee7cd9588332b759621d204fa7cd20224ff

7 years agoRemove set and map wrappers from ItemView 74/132374/5
Richard Huang [Fri, 2 Jun 2017 15:24:45 +0000 (16:24 +0100)]
Remove set and map wrappers from ItemView

Change-Id: I1e827af982842d6bc3a9ee9fdacb51c88aa77483

7 years agoMerge "Text scroller renderer bug fix" into devel/master
Adeel Kazmi [Mon, 5 Jun 2017 10:19:20 +0000 (10:19 +0000)]
Merge "Text scroller renderer bug fix" into devel/master

7 years agoMerge "Text scroll animation bug fix" into devel/master
Adeel Kazmi [Mon, 5 Jun 2017 10:17:12 +0000 (10:17 +0000)]
Merge "Text scroll animation bug fix" into devel/master

7 years agoMerge "Added style name for styling TextEditor ScrollBar" into devel/master
minho.sun [Mon, 5 Jun 2017 05:27:16 +0000 (05:27 +0000)]
Merge "Added style name for styling TextEditor ScrollBar" into devel/master

7 years ago(Visuals) Change AnchorPoint & Origin defaults to TOP_BEGIN 55/132355/3
Adeel Kazmi [Fri, 2 Jun 2017 11:10:09 +0000 (12:10 +0100)]
(Visuals) Change AnchorPoint & Origin defaults to TOP_BEGIN

Change-Id: I50433bfefc82a13292051586b99832672293eb86

7 years agoMerge "DALi Version 1.2.42" into devel/master
Adeel Kazmi [Fri, 2 Jun 2017 14:13:59 +0000 (14:13 +0000)]
Merge "DALi Version 1.2.42" into devel/master

7 years ago[dali_1.2.42] Merge branch 'devel/master' 63/132363/1
Nick Holland [Fri, 2 Jun 2017 11:56:33 +0000 (12:56 +0100)]
[dali_1.2.42] Merge branch 'devel/master'

Change-Id: Iee4b624e159ad90653e6eb602ee0da0187db4054

7 years agoDALi Version 1.2.42 59/132359/1 dali_1.2.42
Nick Holland [Fri, 2 Jun 2017 11:55:51 +0000 (12:55 +0100)]
DALi Version 1.2.42

Change-Id: Idfe8a84e568fdf1b0307690f28dfb3d6f22b1cd4

7 years agoAdd PLACEHOLDER properties to TextEditor 68/130868/7
Seoyeon Kim [Wed, 24 May 2017 07:53:01 +0000 (16:53 +0900)]
Add PLACEHOLDER properties to TextEditor

- PLACEHOLDER_TEXT and PLACEHOLDER_TEXT_COLOR

Change-Id: I137217a863ab1c70a555981b7ea6d6e7778fe91d
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
7 years agoText scroll animation bug fix 91/130691/6
Jinho, Lee [Tue, 23 May 2017 09:52:46 +0000 (18:52 +0900)]
Text scroll animation bug fix

Text scroll animations continue to play even if TextLabel called SetProperty.
Text scroll animations don't be played if TextLabel called SetProperty after setting stop.

Change-Id: I9ecae3c4aea50cf1032d4ee0135b9d7d41701d04

7 years agoText scroller renderer bug fix 76/132276/1
Jinho, Lee [Fri, 2 Jun 2017 05:10:08 +0000 (14:10 +0900)]
Text scroller renderer bug fix

Change-Id: Ia8301de5744ce89a82650a3f1bbec73f0862d4a9

7 years agoMerge "Add read-only property for getting text line count" into devel/master
Heeyong Song [Fri, 2 Jun 2017 04:37:37 +0000 (04:37 +0000)]
Merge "Add read-only property for getting text line count" into devel/master

7 years ago(TextLabel) Ensure auto scrolling respects the horizontal alignment 16/132016/3
Adeel Kazmi [Wed, 31 May 2017 18:09:26 +0000 (19:09 +0100)]
(TextLabel) Ensure auto scrolling respects the horizontal alignment

Change-Id: Ief71a78f83596aceb328d590024a70c2e210d4cd

7 years agoFixed for infinity loop mode 57/130557/6
Jinho, Lee [Tue, 23 May 2017 02:26:15 +0000 (11:26 +0900)]
Fixed for infinity loop mode

StopScrolling logic have been seperated from SetLoopCount

Change-Id: Iddfd0ce5a79d08b7005d4ca3f9121ce3ace8eb55

7 years agoAdd read-only property for getting text line count 32/128932/12
Jinho, Lee [Thu, 11 May 2017 14:24:53 +0000 (23:24 +0900)]
Add read-only property for getting text line count

Change-Id: I316752b0a8b77187d2995b7c8a2ad4be7650b371

7 years agoRemove profile build dependencies 72/129572/4
Seoyeon Kim [Wed, 17 May 2017 04:38:20 +0000 (13:38 +0900)]
Remove profile build dependencies

- From Tizen 4.0, profile dependent build is not allowed.
  So, removed profile macro in .spec file and configure.ac file.

Change-Id: Id8f62eafb78ea87704e00577ffbbf3ecc1d52046
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
7 years agoAdded style name for styling TextEditor ScrollBar 89/131989/1
minho.sun [Wed, 31 May 2017 12:09:27 +0000 (21:09 +0900)]
Added style name for styling TextEditor ScrollBar

Added style name for styling TextEditor ScrollBar.

ScrollBar : TextEditorScrollBar
ScrollBar Indicotor : TextEditorScrollBarIndicator

Change-Id: Icfc6ca896635a26246fc8aee2d8437c675e3768b
Signed-off-by: minho.sun <minho.sun@samsung.com>
7 years agoMerge "Fix a crash in ImageVisual in case of an invalid image and changed to render...
Heeyong Song [Wed, 31 May 2017 01:08:33 +0000 (01:08 +0000)]
Merge "Fix a crash in ImageVisual in case of an invalid image and changed to render broken.png in the case" into devel/master

7 years agoText style to return properties(FONT_STYLE) as string 67/130167/3
Jinho, Lee [Fri, 19 May 2017 07:08:54 +0000 (16:08 +0900)]
Text style to return properties(FONT_STYLE) as string

Change-Id: I0365eed729f5beef330b0a1bd2c356fbd0c050bc

7 years agoFix a crash in ImageVisual in case of an invalid image and changed to render broken... 86/131286/4
Heeyong Song [Fri, 26 May 2017 06:54:05 +0000 (15:54 +0900)]
Fix a crash in ImageVisual in case of an invalid image and changed to render broken.png in the case

Change-Id: I21a04494d60a907270a626359b25af283739abf0

7 years agoMerge "Fix feedback style error message." into devel/master
Adeel Kazmi [Tue, 30 May 2017 08:47:49 +0000 (08:47 +0000)]
Merge "Fix feedback style error message." into devel/master

7 years agoMerge "Do nothing when setting focus on same actor" into devel/master
Adeel Kazmi [Tue, 30 May 2017 08:34:28 +0000 (08:34 +0000)]
Merge "Do nothing when setting focus on same actor" into devel/master

7 years agoFix feedback style error message. 95/131595/1
minho.sun [Tue, 30 May 2017 06:39:07 +0000 (15:39 +0900)]
Fix feedback style error message.

Fix feedback style error message.
It ocurred because of empty path.

Give default theme path when applying default theme instead of empty path.

Plus, add default-feedback-theme.json to resource package.

Change-Id: I2459cc39a798bf3b86c688275feae8957798bcd9
Signed-off-by: minho.sun <minho.sun@samsung.com>
7 years agoMerge "Removal of unnecessary set and map wrappers" into devel/master
David Steele [Fri, 26 May 2017 17:30:30 +0000 (17:30 +0000)]
Merge "Removal of unnecessary set and map wrappers" into devel/master

7 years agoRemoval of unnecessary set and map wrappers 55/131355/2
Kimmo Hoikka [Fri, 26 May 2017 12:58:02 +0000 (13:58 +0100)]
Removal of unnecessary set and map wrappers

Change-Id: I80338abf1574e3560f400fde69a33787bfc9509a

7 years ago(ControlImpl) Move Visual related APIs to the Devel API 76/131176/6
Adeel Kazmi [Thu, 25 May 2017 17:35:30 +0000 (18:35 +0100)]
(ControlImpl) Move Visual related APIs to the Devel API

Change-Id: I630f37ad03029e907a5d5ed768902ceec8b22c3c

7 years ago[dali_1.2.41] Merge branch 'devel/master' 50/131350/1
greynaga [Fri, 26 May 2017 12:31:40 +0000 (13:31 +0100)]
[dali_1.2.41] Merge branch 'devel/master'

Change-Id: Ia8f3460be6c1849464993b88402916d5707557c3

7 years agoDALi Version 1.2.41 46/131346/1 dali_1.2.41
greynaga [Fri, 26 May 2017 12:30:58 +0000 (13:30 +0100)]
DALi Version 1.2.41

Change-Id: I5b051a13ac16deb64058af649b4abe024a40e868

7 years agoCleanup ResourceLoading and PlatformAbstraction 83/129983/3
Kimmo Hoikka [Thu, 18 May 2017 17:06:10 +0000 (18:06 +0100)]
Cleanup ResourceLoading and PlatformAbstraction

- Cleanup in PlatformAbstraction
- Cleaned up code and comments

Change-Id: Iabb992ceb71e865de27588c8a8affd8de002922a

7 years agoMerge "Use Handle::GetCurrentProperty instead of Devel API" into devel/master
Adeel Kazmi [Wed, 24 May 2017 10:14:22 +0000 (10:14 +0000)]
Merge "Use Handle::GetCurrentProperty instead of Devel API" into devel/master

7 years agoRemove dali-swig, enable CXXFLAGS 18/130518/1
Agnelo Vaz [Mon, 22 May 2017 14:20:01 +0000 (15:20 +0100)]
Remove dali-swig, enable CXXFLAGS

Change-Id: I6a4316448539d1104d645f55790a042e00582147

7 years agoDo nothing when setting focus on same actor 53/128453/2
minho.sun [Mon, 10 Apr 2017 03:28:07 +0000 (12:28 +0900)]
Do nothing when setting focus on same actor

Do nothing when setting focus on same actor again.

Change-Id: Ie073856b0019587d71b4ae0f64d8664212e2fccc

7 years agoUse Handle::GetCurrentProperty instead of Devel API 54/130354/1
minho.sun [Mon, 22 May 2017 06:07:09 +0000 (15:07 +0900)]
Use Handle::GetCurrentProperty instead of Devel API

DevelHandle::GetCurrentProperty is moved to public.
So, use Handle::GetCurrentProperty instead of devel.

Change-Id: Ib2d25e5dcdf954409fc35a9c01b039907c9421b4
Signed-off-by: minho.sun <minho.sun@samsung.com>
7 years agoMerge "DALi Version 1.2.40" into devel/master
Adeel Kazmi [Fri, 19 May 2017 12:45:17 +0000 (12:45 +0000)]
Merge "DALi Version 1.2.40" into devel/master

7 years ago[dali_1.2.40] Merge branch 'devel/master' 31/130231/1
Francisco Santos [Fri, 19 May 2017 12:44:14 +0000 (13:44 +0100)]
[dali_1.2.40] Merge branch 'devel/master'

Change-Id: I1f0451276501e19b07c4805f45b7241b03887c2d

7 years agoDALi Version 1.2.40 27/130227/1 dali_1.2.40
Francisco Santos [Fri, 19 May 2017 12:43:34 +0000 (13:43 +0100)]
DALi Version 1.2.40

Change-Id: I6f009a096fcdd3b4b05f2cf8da42714a22d8f3d6

7 years agoMerge "Fix RemoveText code in text-controller.cpp" into devel/master
Seoyeon Kim [Fri, 19 May 2017 04:44:04 +0000 (04:44 +0000)]
Merge "Fix RemoveText code in text-controller.cpp" into devel/master

7 years agoSeparate C# classes into Internal and Public 68/127968/18
Umar [Tue, 2 May 2017 18:02:30 +0000 (19:02 +0100)]
Separate C# classes into Internal and Public

Change-Id: I12b90fc0eb411d0d4df9dcbf6d79e70a46cc4fb8