minho.sun [Tue, 1 Aug 2017 01:08:30 +0000 (10:08 +0900)]
Revert "[Tizen] Fix resource package install error"
This reverts commit
be285c96c24c22f863e411c7bfd752123789bfb2.
Change-Id: Ib8d74aec2f9869400a4777bf6b506659e6ffd9bf
minho.sun [Tue, 1 Aug 2017 01:07:51 +0000 (10:07 +0900)]
Revert "[Tizen] Removed redundant dali-sharp folder"
This reverts commit
e7e07f9f6f7e1adb0f61297a621a716c3dc50aaa.
Change-Id: I1e12adc1939cd0757186c1261a0980e0c9d3e4b8
minho.sun [Tue, 1 Aug 2017 01:07:34 +0000 (10:07 +0900)]
Revert "[Tizen] Fix resource package install issue"
This reverts commit
480357dbda1845b090099851e20ed0b416b51df9.
Change-Id: Ie73c061678582bbd976e224fc342a6ab087b6986
minho.sun [Mon, 31 Jul 2017 06:22:39 +0000 (15:22 +0900)]
[Tizen] Fix resource package install issue
Fix resource package install issue.
It caused by post uninstall steps.
Change-Id: Ifec5dcf4941aa6e3748f3fd9f52eff32e4354a2b
Signed-off-by: minho.sun <minho.sun@samsung.com>
Adeel Kazmi [Tue, 25 Jul 2017 17:02:50 +0000 (18:02 +0100)]
[Tizen] Removed redundant dali-sharp folder
Change-Id: Ieba47b96838587b04f9ea661476e4c7aa7ccdb4f
taeyoon0.lee [Mon, 24 Jul 2017 04:46:24 +0000 (13:46 +0900)]
[Tizen] Fix resource package install error
This reverts commit
2e807540a6224c4e3461cfd3cb82981c6d092d70.
Change-Id: I11d877eb620736b69ac55d02ba822a8d4bd8af8f
taeyoon0.lee [Mon, 24 Jul 2017 04:45:43 +0000 (13:45 +0900)]
[Tizen] fix resource package update bug
This reverts commit
fcf93fa90562dd75deb58643d01196d5298fa776.
Change-Id: Ie3db19592d79ca4b78853f392bf4261def5a3205
taeyoon0.lee [Mon, 24 Jul 2017 04:45:03 +0000 (13:45 +0900)]
[Tizen] Restore behavior of Uploaded and LoadingFinished signal
This reverts commit
be158213cf3791451871c3a08d7b13894279662d.
Change-Id: Ib260d45cf4f692f15b178d1b4e92a4670c8df16c
taeyoon0.lee [Mon, 24 Jul 2017 03:43:52 +0000 (12:43 +0900)]
Merge branch 'devel/master (1.2.49)' into tizen
Change-Id: I808b333f7fa76a20b275603d5a1e52b2d993abd4
taeyoon0.lee [Mon, 24 Jul 2017 03:43:01 +0000 (12:43 +0900)]
Revert "[Tizen] Restore behavior of Uploaded and LoadingFinished signal"
This reverts commit
42ce680924ef4123c56654433729dc90379bbf34.
Change-Id: Ib383ef86a483f21cbb3d648f03e150f92541a16c
taeyoon0.lee [Mon, 24 Jul 2017 03:42:28 +0000 (12:42 +0900)]
Revert "[Tizen] Revert "Replace registered visuals only when replacement is ready""
This reverts commit
59c28ffe7ae770ba86b1840760902fce5210cc92.
Change-Id: I47f19c91589c53bc9aa9fb15928dc213f2d7e2f3
taeyoon0.lee [Mon, 24 Jul 2017 03:41:38 +0000 (12:41 +0900)]
Revert "[Tizen] fix resource package update bug"
This reverts commit
edcfb92968bbf87c003dfcf3e7057cdfb43155d3.
Change-Id: I464f50d0da8568a99a70438da6dcf23b9da1360a
taeyoon0.lee [Mon, 24 Jul 2017 03:39:40 +0000 (12:39 +0900)]
Revert "[Tizen] Fix resource package install error"
This reverts commit
2a00e4d5a243bc812841610b875ed3cb76fe7e53.
Change-Id: Ic813da4b9dd58e28d7135e2fae71df90c49a9d2c
HyunJu Shin [Mon, 24 Jul 2017 02:51:07 +0000 (02:51 +0000)]
Merge "Line wrap mode property is added." into devel/master
Adeel Kazmi [Fri, 21 Jul 2017 13:27:45 +0000 (13:27 +0000)]
Merge "DALi Version 1.2.49" into devel/master
David Steele [Fri, 21 Jul 2017 13:24:36 +0000 (14:24 +0100)]
DALi Version 1.2.49
Change-Id: I58229a9bf8cf409142a532ebf1b57b01dfa32876
Adeel Kazmi [Fri, 21 Jul 2017 09:32:21 +0000 (09:32 +0000)]
Merge "Added Scaling and cropping properties to the image visual mask" into devel/master
Jinho, Lee [Wed, 19 Jul 2017 06:39:45 +0000 (15:39 +0900)]
Line wrap mode property is added.
When a text line is too long and needs to be moved to the next line, it decides whether to move text to next line word by word or character by character.
Change-Id: I502327ab7f7680570b7c3712c7e6f519c92d05a4
David Steele [Wed, 19 Jul 2017 18:52:51 +0000 (19:52 +0100)]
Added Scaling and cropping properties to the image visual mask
Have added 2 new properties to image visual to enable zooming into
an image before masking it.
Change-Id: I47259054f010497c0b92f1e46ff8bc15fc708ba4
Signed-off-by: David Steele <david.steele@samsung.com>
Seoyeon Kim [Wed, 19 Jul 2017 04:36:46 +0000 (13:36 +0900)]
Add PlaceholderTextFocused key in PLACEHOLDER property
- PLACEHOLDER property is MAP type.
Change-Id: I4694860c892c35ef112fab646b72258de538c563
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
Adeel Kazmi [Fri, 14 Jul 2017 14:41:51 +0000 (14:41 +0000)]
Merge "Adding support for multiple images in AnimatedImageVisual" into devel/master
David Steele [Fri, 14 Jul 2017 13:01:35 +0000 (13:01 +0000)]
Merge "DALi Version 1.2.48" into devel/master
adam.b [Fri, 14 Jul 2017 12:29:21 +0000 (13:29 +0100)]
DALi Version 1.2.48
Change-Id: Ie4641024a5ab47605dc74d7e6af29dd53cea3fa9
David Steele [Wed, 28 Jun 2017 12:40:23 +0000 (13:40 +0100)]
Adding support for multiple images in AnimatedImageVisual
As well as supporting animated GIF, the animated image visual also
supports animating between a number of images.
This can be done using a property map containing the following:
{
"url":[ "url1", "url2", "url3", "url4", "url5" ],
"batchSize" : 3,
"cacheSize" : 4,
"frameDelay" : 100
}
The cache size is the total number of images that will be loaded at any one time;
the batch size is the maximum number of images it will attempt to load before displaying.
If the cache size is smaller than the batch size, it is increased to match. If either
are larger than the number of urls, they are reduced to match.
As soon as the visual is created, it will start loading up to batchSize urls into the
cache. After each frame has completed, it will start loading the next batch, etc,
until the cache is full. After the next frame, it will load only the next URL into
the cache.
If at any time, the next image is not ready, it will wait for the loading to complete
before displaying and triggering the next batch/frame load, but will not reset the timer.
Change-Id: Iccd59768aec814ab3b73fb7b817e45b95299b2c2
Signed-off-by: David Steele <david.steele@samsung.com>
HyunJu Shin [Fri, 14 Jul 2017 07:56:59 +0000 (07:56 +0000)]
Merge "Calculate a new height when full relayout needed" into devel/master
Jinho, Lee [Thu, 13 Jul 2017 04:16:14 +0000 (04:16 +0000)]
Merge "Applyed text padding to TextLabel, Field, Editor" into devel/master
Jinho, Lee [Thu, 13 Jul 2017 03:03:21 +0000 (12:03 +0900)]
Calculate a new height when full relayout needed
Change-Id: Ifc7fc385e224abb5b85cc79e22b29b50ebb965f4
minho.sun [Thu, 13 Jul 2017 01:18:34 +0000 (10:18 +0900)]
[Tizen] Fix resource package install error
Fix resource package install error.
Change-Id: I14016bc0f0e9cef41452a94c31530de12295ec49
Signed-off-by: minho.sun <minho.sun@samsung.com>
taeyoon0.lee [Wed, 12 Jul 2017 16:24:50 +0000 (16:24 +0000)]
Merge "Modified key event in TC" into devel/master
Agnelo Vaz [Mon, 3 Jul 2017 14:32:22 +0000 (15:32 +0100)]
Visual replacements logic updated
Setting conrol off stage ensures correct visuals shown when returned on stage
Ensure Control relayout is requested when a Visual becomes ready
Add flag to know if registered visual is pending ( can help relayouting )
Update of replacement logic
Change-Id: Id6cde8dc6a006d48155274c77210e3bb494e1765
Agnelo Vaz [Tue, 11 Jul 2017 14:04:59 +0000 (15:04 +0100)]
Control ResouceReady emits when all 'enabled' visuals ready
Change-Id: I2f85e317392f69c4dd504c19dd7756f30d4459b4
Jinho, Lee [Wed, 28 Jun 2017 13:10:54 +0000 (22:10 +0900)]
Applyed text padding to TextLabel, Field, Editor
Change-Id: Id736d9ce70626a624ed55d3644494d673159bf0a
minho.sun [Tue, 11 Jul 2017 10:48:25 +0000 (19:48 +0900)]
[Tizen] fix resource package update bug
when updating resource package, always get mv error.
Fix them by removing all files in styles at pre-install.
Change-Id: I72c881f67daa6c080571e101610339bcce15e6dc
Signed-off-by: minho.sun <minho.sun@samsung.com>
Seoyeon Kim [Fri, 7 Jul 2017 06:25:58 +0000 (15:25 +0900)]
Fixed for single line text updates
- Fixed a SINGLE_LINE_BOX text update bug.
Change-Id: If1742cf19ffd75cda66ec705ae611ec8340ef48c
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
Adeel Kazmi [Fri, 7 Jul 2017 10:45:25 +0000 (10:45 +0000)]
Merge "DALi Version 1.2.47" into devel/master
Agnelo Vaz [Fri, 7 Jul 2017 10:20:35 +0000 (11:20 +0100)]
DALi Version 1.2.47
Change-Id: I0ee00c0c80470a7ee0ce4ccd7ec5ba44166a22ae
David Steele [Thu, 6 Jul 2017 16:53:40 +0000 (17:53 +0100)]
Updated test case CmakeLists.txt to work with newer version of CMAKE
Change-Id: I35e52281977d5c64f83e39c1acea5568fecf946e
taeyoon0.lee [Thu, 6 Jul 2017 06:58:23 +0000 (15:58 +0900)]
Modified key event in TC
- Changed DevelKeyEvent::... to DevelDevice::...
- Added subclass
Change-Id: I58e4fabee3afad39a0f7142a9ec2fe44340104e2
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
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>
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
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
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