Denis Khalikov [Thu, 4 May 2017 08:47:32 +0000 (11:47 +0300)]
Support dual ABI
Change-Id: I76ddf1cd3acd6d8e1f91859758de6929735fe580
Heeyong Song [Thu, 6 Jul 2017 04:49:50 +0000 (13:49 +0900)]
[Tizen] Revert "Replace registered visuals only when replacement is ready"
This reverts commit
fb390b3f5e576e2fc11b3755f4dc9c3ff2150d90.
Conflicts:
dali-toolkit/internal/controls/image-view/image-view-impl.h
Change-Id: I98b84df5b4d49f04f3c2671efdee3a3a3f114c13
Jinho, Lee [Tue, 4 Jul 2017 06:48:31 +0000 (15:48 +0900)]
[Tizen] Restore behavior of Uploaded and LoadingFinished signal
This reverts commit
155449f47de8b6e0a4c4edae2cab7ae16d5fd274.
Change-Id: I09703c4baf63ee560c34a2d9a7af3b6bef02041d
Jinho, Lee [Tue, 4 Jul 2017 06:00:41 +0000 (15:00 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: I9d7bb28dab694ad14484e248ca9fb1cce69cdb03
Jinho, Lee [Tue, 4 Jul 2017 05:54:47 +0000 (14:54 +0900)]
Revert "[Tizen] Restore behavior of Uploaded and LoadingFinished signal"
This reverts commit
d2bce9840862469d6ddfdaec4c94b46eaee14772.
Change-Id: Ic0808e8c920f25df6ecce153336ade390982b4f8
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
taeyoon [Tue, 4 Jul 2017 03:14:49 +0000 (03:14 +0000)]
Merge "Modified video view impl by considering visual" into devel/master
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>
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
Seoyeon Kim [Mon, 3 Jul 2017 00:47:04 +0000 (00:47 +0000)]
Merge "Implement Placeholder additional property" 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
Adeel Kazmi [Fri, 30 Jun 2017 10:43:25 +0000 (10:43 +0000)]
Merge "DALi Version 1.2.46" into devel/master
Adeel Kazmi [Fri, 30 Jun 2017 10:20:52 +0000 (11:20 +0100)]
DALi Version 1.2.46
Change-Id: I724f4103f6bbf589dab86bc0ddb34870d3976b0e
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>
minho.sun [Fri, 30 Jun 2017 07:34:10 +0000 (07:34 +0000)]
Merge "Added config section to stylesheet" into devel/master
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
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
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>
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
taeyoon [Fri, 9 Sep 2016 10:09:40 +0000 (19:09 +0900)]
Modified video view impl by considering visual
Change-Id: I3f0d1082f4e210f23a2aec0524016bbc08b38ff5
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>
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
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>
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
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>
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.
Paul Wisbey [Mon, 13 Feb 2017 11:02:31 +0000 (11:02 +0000)]
Removed unused variable from 9-patch shader
Change-Id: I26eee3590a4eecb1d61d79b941546317e7124803
Adeel Kazmi [Fri, 23 Jun 2017 09:50:57 +0000 (09:50 +0000)]
Merge "DALi Version 1.2.45" 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
Victor Cebollada [Fri, 23 Jun 2017 09:43:59 +0000 (10:43 +0100)]
DALi Version 1.2.45
Change-Id: I06813e9cba6bd9e70a7f5a04b1e7d43bf8d5dc6e
minho.sun [Wed, 21 Jun 2017 05:06:09 +0000 (05:06 +0000)]
Merge "Make TextEditor emit ScrollStateChangedSignal after ScrollBar creation" 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
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
Heeyong Song [Tue, 20 Jun 2017 07:52:06 +0000 (16:52 +0900)]
[Tizen] Restore behavior of Uploaded and LoadingFinished signal
Change-Id: I05c0c9b8df91d8310bcc9e55007141e1f654aae4
Heeyong Song [Tue, 20 Jun 2017 07:51:13 +0000 (16:51 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: I61c6723291e2e9af475e6ed454b1125936f7eebc
Heeyong Song [Tue, 20 Jun 2017 07:50:57 +0000 (16:50 +0900)]
Revert "[Tizen] Fix SVACE issue - change sscanf(%d) to strtol"
This reverts commit
eb4bb5f26b2e03eb7a66bbccedb93c78e92a5b03.
Change-Id: I1ec196378764e1728d34793aa25322a5051b1035
Heeyong Song [Tue, 20 Jun 2017 07:50:33 +0000 (16:50 +0900)]
Revert "[Tizen] Restore behavior of Uploaded and LoadingFinished signal"
This reverts commit
e72c514f927e67214497efcbbf545b4017f92f8c.
Change-Id: Ia5c851faf28b45fbf7756aa063f3ec1016ae0618
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
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
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
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
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>
Adeel Kazmi [Fri, 16 Jun 2017 11:09:11 +0000 (11:09 +0000)]
Merge "DALi Version 1.2.44" into devel/master
Umar [Fri, 16 Jun 2017 11:03:43 +0000 (12:03 +0100)]
DALi Version 1.2.44
Change-Id: Ia567aeec4addef1d25095a9162d04b4063febe75
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
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
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>
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>
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
Seoyeon Kim [Tue, 13 Jun 2017 02:11:34 +0000 (11:11 +0900)]
[Tizen] Restore behavior of Uploaded and LoadingFinished signal
This reverts commit
861ac65311644a35ee774d387ecfddbd314c201b.
Change-Id: I3e1a46a6dfe468a49a294c037e7e2fcf66409ad4
Seoyeon Kim [Tue, 13 Jun 2017 02:11:08 +0000 (11:11 +0900)]
[Tizen] Fix SVACE issue - change sscanf(%d) to strtol
This reverts commit
96a6656a0330918e7dc06cfb2756bf1373f64509.
Change-Id: Ic5503046d6adec8ac128b89a0766e05b00569fd7
Seoyeon Kim [Tue, 13 Jun 2017 02:09:08 +0000 (11:09 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: I870581e0065ea9a692599dd899fa90dc48854a89
Seoyeon Kim [Tue, 13 Jun 2017 02:07:38 +0000 (11:07 +0900)]
Revert "[Tizen] Make all profile have mobile dali_toolkit_profile except tv"
This reverts commit
2ceace9727e8e21275ca91d392a932f5fbe4bafe.
Change-Id: Ic98a9b2acc16d343411ccf80a2c42fa9786663c7
Seoyeon Kim [Tue, 13 Jun 2017 02:07:20 +0000 (11:07 +0900)]
Revert "[Tizen] Remove profile build dependencies"
This reverts commit
b6288ac0cc4ec207d47c78882b1f503f553e09a0.
Change-Id: I6d571bd182b48f61b6fbab63e6c69191ca5967b2
Seoyeon Kim [Tue, 13 Jun 2017 02:06:50 +0000 (11:06 +0900)]
Revert "[Tizen] Fix SVACE issue - change sscanf(%d) to strtol"
This reverts commit
9890eb95dff1675153e3b7818f2623d9f2702fc7.
Change-Id: Iceb70822399f404a4d291fa5e61d28c08f14ed1e
Seoyeon Kim [Tue, 13 Jun 2017 02:06:33 +0000 (11:06 +0900)]
Revert "[Tizen] Restore behavior of Uploaded and LoadingFinished signal"
This reverts commit
6c45feefec8cf952dd667016352f312396ff366b.
Change-Id: Iaf1cd4fc4906fed4674718d28f08e77df7fa4ae8
David Steele [Mon, 12 Jun 2017 15:31:11 +0000 (15:31 +0000)]
Merge "Fixups following changes to actor traversal" into devel/master
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
Agnelo Vaz [Fri, 9 Jun 2017 17:26:11 +0000 (18:26 +0100)]
TextureManager "if" clause error
Change-Id: Idba7a1601273a8689dbfd1db3c6fb827dd3e3d7e
Adeel Kazmi [Fri, 9 Jun 2017 12:53:58 +0000 (12:53 +0000)]
Merge "Updated ImageVisual to handle CPU Image Masking" into devel/master
Richard Huang [Fri, 9 Jun 2017 12:23:23 +0000 (13:23 +0100)]
DALi Version 1.2.43
Change-Id: I776e419011db8b06db04c4cddb6d48279cc80522
Adeel Kazmi [Thu, 8 Jun 2017 14:05:04 +0000 (14:05 +0000)]
Merge "Added ScrollStateChangedSignal to TextEditor." into devel/master
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>
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
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>
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
Adeel Kazmi [Wed, 7 Jun 2017 10:03:33 +0000 (10:03 +0000)]
Merge "Remove profile build dependencies" into devel/master
minho.sun [Wed, 7 Jun 2017 05:56:48 +0000 (14:56 +0900)]
[Tizen] Restore behavior of Uploaded and LoadingFinished signal
This reverts commit
9f6fa68b4e96e4a4e90d36a9b530f281aa2b39df.
Change-Id: Ia58464b6c8417e7798858176171b2ca9f536eda1
minho.sun [Wed, 7 Jun 2017 05:56:39 +0000 (14:56 +0900)]
[Tizen] Fix SVACE issue - change sscanf(%d) to strtol
This reverts commit
22b429f142e1130bc3db8e5b730ae559ba5635fb.
Change-Id: I93e194ace1b6177a8082fce5b80b16e5d26c9f9f
minho.sun [Wed, 7 Jun 2017 05:56:23 +0000 (14:56 +0900)]
[Tizen] Remove profile build dependencies
This reverts commit
883f0a09d5d1c78ea002497299e6e25a5d4b998a.
Change-Id: I57ee4efc441d02853ce26b6aaab58d685bab10b9
minho.sun [Wed, 7 Jun 2017 05:56:14 +0000 (14:56 +0900)]
[Tizen] Make all profile have mobile dali_toolkit_profile except tv
This reverts commit
2cc8a37835d5c332f1af6846e2a1208345d2e30c.
Change-Id: I6c1c3a772960f4c1e4ccd24459c6c62c1c643eb1
minho.sun [Wed, 7 Jun 2017 05:55:54 +0000 (14:55 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: I88623c69468ba25730b9265dbd9a0bad1b803ee7
minho.sun [Wed, 7 Jun 2017 03:08:41 +0000 (12:08 +0900)]
Revert "[Tizen] Make all profile have mobile dali_toolkit_profile except tv"
This reverts commit
12e5d8f16ae47b8fb6eba6c14d038dab8df4c912.
Change-Id: I6027075a8d243b81ea515200c23e905ecf012138
minho.sun [Wed, 7 Jun 2017 03:08:32 +0000 (12:08 +0900)]
Revert "[Tizen] Remove profile build dependencies"
This reverts commit
c8306b4602f8e1ebfb542cef839da41ccf37ef4e.
Change-Id: If0142281526537f317f02b5f45b758d2985728f4
minho.sun [Wed, 7 Jun 2017 03:08:25 +0000 (12:08 +0900)]
Revert "[Tizen] Fix SVACE issue - change sscanf(%d) to strtol"
This reverts commit
5d9359856307ea7c326ea1b41d0cb0717fa072f5.
Change-Id: I269c8d569715bfe6631bb6ddf59ed257a02e54f1
minho.sun [Wed, 7 Jun 2017 03:08:14 +0000 (12:08 +0900)]
Revert "[Tizen] Restore behavior of Uploaded and LoadingFinished signal"
This reverts commit
f3e7e9a264faa49607758b5221c05dac72f7d231.
Change-Id: I1039fb5be3c1835b41b522e2a73803651b9a0ba7
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
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
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
Richard Huang [Fri, 2 Jun 2017 15:24:45 +0000 (16:24 +0100)]
Remove set and map wrappers from ItemView
Change-Id: I1e827af982842d6bc3a9ee9fdacb51c88aa77483
Adeel Kazmi [Mon, 5 Jun 2017 10:19:20 +0000 (10:19 +0000)]
Merge "Text scroller renderer 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
minho.sun [Mon, 5 Jun 2017 05:27:16 +0000 (05:27 +0000)]
Merge "Added style name for styling TextEditor ScrollBar" into devel/master
Adeel Kazmi [Fri, 2 Jun 2017 11:10:09 +0000 (12:10 +0100)]
(Visuals) Change AnchorPoint & Origin defaults to TOP_BEGIN
Change-Id: I50433bfefc82a13292051586b99832672293eb86
Adeel Kazmi [Fri, 2 Jun 2017 14:13:59 +0000 (14:13 +0000)]
Merge "DALi Version 1.2.42" into devel/master
Nick Holland [Fri, 2 Jun 2017 11:55:51 +0000 (12:55 +0100)]
DALi Version 1.2.42
Change-Id: Idfe8a84e568fdf1b0307690f28dfb3d6f22b1cd4
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>
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
Jinho, Lee [Fri, 2 Jun 2017 05:10:08 +0000 (14:10 +0900)]
Text scroller renderer bug fix
Change-Id: Ia8301de5744ce89a82650a3f1bbec73f0862d4a9
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
Adeel Kazmi [Wed, 31 May 2017 18:09:26 +0000 (19:09 +0100)]
(TextLabel) Ensure auto scrolling respects the horizontal alignment
Change-Id: Ief71a78f83596aceb328d590024a70c2e210d4cd
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
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
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>
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>
Jinho, Lee [Wed, 31 May 2017 04:23:57 +0000 (13:23 +0900)]
[Tizen] Restore behavior of Uploaded and LoadingFinished signal
This reverts commit
f38c6563a9d4d4f159d67547f6131d97fc7b430a.
Change-Id: I1c30da224f1c631c64ef1a3b9aa55ffc237c0162
Jinho, Lee [Wed, 31 May 2017 04:15:21 +0000 (13:15 +0900)]
[Tizen] Fix SVACE issue - change sscanf(%d) to strtol
This reverts commit
3ff5d09452cb826eb6f2d1d16f21da5342f1a0c1.
Change-Id: Id677eec8d9a5608f211fbf65486005e99bf6a3a3
Jinho, Lee [Wed, 31 May 2017 04:11:52 +0000 (13:11 +0900)]
[Tizen] Remove profile build dependencies
This reverts commit
acfdcff8ed1cc6669755cf9e086503032d9456a4.
Change-Id: I9983bb7db9709569f241d13b286180e69034edfd
Jinho, Lee [Wed, 31 May 2017 02:49:40 +0000 (11:49 +0900)]
[Tizen] Make all profile have mobile dali_toolkit_profile except tv
This reverts commit
6586baf4ad5e3c7002f94c011dc36bb780e729a1.
Change-Id: I444623dd383a2b4cfb492e6b9287377f41eb4503
Jinho, Lee [Wed, 31 May 2017 02:30:55 +0000 (11:30 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: Icf648f8ecba282bd38c6aac8b10e49ac83cdbe5b
projects / platform / core / uifw / dali-toolkit.git / log