minho.sun [Thu, 2 Aug 2018 01:24:09 +0000 (10:24 +0900)]
[Tizen] Do not substarct outline width in text-controller
This reverts commit
dfc63cd430ca6b8a331ed09490a7219ac3584f46.
Change-Id: I42c88c29739323fb38cbc31302f282038466c29b
minho.sun [Thu, 2 Aug 2018 01:23:57 +0000 (10:23 +0900)]
[Tizen] Implement WebViewLite interface
This reverts commit
caaf651bdd60b9aff9705705e5dc40aa7138570e.
Change-Id: I01887e2f6f00c9c4bd9c102ea98ff891eae4bbf2
minho.sun [Thu, 2 Aug 2018 01:23:43 +0000 (10:23 +0900)]
[Tizen] Restore behavior of Uploaded and LoadingFinished signal
This reverts commit
24f4d30f14ffce268d002da4fa81a5bcb7b5dea8.
Change-Id: I028fa935914c2fb37439ae4ceaab68e4b534b6bf
minho.sun [Thu, 2 Aug 2018 01:23:01 +0000 (10:23 +0900)]
Merge branch 'devel/master' into tizen
minho.sun [Thu, 2 Aug 2018 01:22:30 +0000 (10:22 +0900)]
Revert "[Tizen] Restore behavior of Uploaded and LoadingFinished signal"
This reverts commit
6b1d55c1e46eac83d66b198dc08f142dfd7a65ae.
minho.sun [Thu, 2 Aug 2018 01:22:28 +0000 (10:22 +0900)]
Revert "[Tizen] Implement WebViewLite interface"
This reverts commit
5fafd2f5bdccb939cd1c6f0ed683df9bd8e43c14.
minho.sun [Thu, 2 Aug 2018 01:22:25 +0000 (10:22 +0900)]
Revert "[Tizen] Do not substarct outline width in text-controller"
This reverts commit
a4f68627350323829fe34629d1d8510329c5c0e2.
minho.sun [Thu, 2 Aug 2018 01:22:23 +0000 (10:22 +0900)]
Revert "[Tizen] Changed Control::SetLayout to handle empty layouts"
This reverts commit
ca885e842b188ed56f0362f974e6287cc7f6914f.
minho.sun [Thu, 2 Aug 2018 01:22:20 +0000 (10:22 +0900)]
Revert "[Tizen] Add codes for Dali Windows Backend"
This reverts commit
238567aa6a9b67926056254607db3589d9b19a98.
Adeel Kazmi [Wed, 1 Aug 2018 12:56:18 +0000 (12:56 +0000)]
Merge "Fix focus issue after calling ClearFocus api" into devel/master
HyunJu Shin [Tue, 31 Jul 2018 09:58:20 +0000 (09:58 +0000)]
Merge "Modified StyleManager::SetTheme to prevent ApplyDefaultTheme breaking" into devel/master
Seoyeon Kim [Wed, 25 Jul 2018 11:25:27 +0000 (20:25 +0900)]
Fix LinearLayout Padding bug
- Consider padding.start to child left when layouting the children vertically.
- Consider padding.top to child top at first on Layout passes.
Change-Id: I75236f8c85a4b5e91edc5868da2250bdc9bf3f19
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
David Steele [Fri, 13 Jul 2018 15:44:06 +0000 (16:44 +0100)]
Modified StyleManager::SetTheme to prevent ApplyDefaultTheme breaking
Change-Id: I6066314d734b87eb1b13ed7946f5e14ef40e4e70
Adeel Kazmi [Fri, 27 Jul 2018 15:51:55 +0000 (15:51 +0000)]
Merge "Change layout item list order according to the actor's child list" into devel/master
David Steele [Fri, 27 Jul 2018 11:42:35 +0000 (12:42 +0100)]
DALi Version 1.3.34
Change-Id: Ief0d54cbd4756d718e03b381899c6dc25358c56d
Heeyong Song [Wed, 25 Jul 2018 08:56:31 +0000 (17:56 +0900)]
Change layout item list order according to the actor's child list
Change-Id: Ibffb65ec27cc5aea98a2736efb3dab9af4b66322
Adeel Kazmi [Wed, 25 Jul 2018 18:24:30 +0000 (19:24 +0100)]
(ImageView) if no padding, then do not set the transform
Previously, we hardcoded the transform every time even if we didn't need to.
This inadvertantly meant that we could not do some animations.
Now, we just set the transform if we've got padding or the fitting-mode
is set to FIT_KEEPT_ASPECT_RATIO.
Change-Id: Ie15c79bb547ced3399851e33a11704fe869d31f6
David Steele [Tue, 24 Jul 2018 19:25:22 +0000 (20:25 +0100)]
Added base64 encoding/decoding for Property Array/String
We need a means of reading and writing data blocks through the property
system for CustomShaders in VK. Added a mechanism to allow encoding
a vector of uin32_t data into a Property::Value of type STRING or
ARRAY of STRINGS, and a means of decoding the same.
This allows us to keep the property system in line with a JSON encoding,
but trading off data size and decode time.
Change-Id: I2247b340571644b21be5b9ef87fc0e3108e2f571
Signed-off-by: David Steele <david.steele@samsung.com>
xb.teng [Wed, 25 Jul 2018 10:00:31 +0000 (18:00 +0800)]
Fix focus issue after calling ClearFocus api
After calling ClearFocus api, mIsFocusIndicatorEnabled will be 0.
In this case, if you call SetCurrentFocusActor again, then the first pressed direction key is valid, but the second pressed direction key can works. It's an issue.
Change-Id: I0d731263f11b40fa3211fd64388f8c9da5707fc9
Daekwang Ryu [Mon, 23 Jul 2018 05:35:46 +0000 (14:35 +0900)]
[Tizen] Add codes for Dali Windows Backend
This reverts commit
94464655944de025a2c22b237868e45aea45b139.
Daekwang Ryu [Mon, 23 Jul 2018 05:35:41 +0000 (14:35 +0900)]
[Tizen] Changed Control::SetLayout to handle empty layouts
This reverts commit
a060ee84d5d203d8c7538b91fdb91b2f3812e9a3.
Daekwang Ryu [Mon, 23 Jul 2018 05:35:39 +0000 (14:35 +0900)]
[Tizen] Do not substarct outline width in text-controller
This reverts commit
4d0cf0c4a57a5c5d470de813744d85c3741c301b.
Daekwang Ryu [Mon, 23 Jul 2018 05:35:37 +0000 (14:35 +0900)]
[Tizen] Implement WebViewLite interface
This reverts commit
143072725b8b49b10a7a2e0fe8494dce3e6ca347.
Daekwang Ryu [Mon, 23 Jul 2018 05:35:34 +0000 (14:35 +0900)]
[Tizen] Restore behavior of Uploaded and LoadingFinished signal
This reverts commit
aef44096fe8871235fba4c8f8ce6b7e33c0fba00.
huiyu.eun [Thu, 5 Apr 2018 02:29:36 +0000 (11:29 +0900)]
Fix image-visual natural size issue using atlas
Change-Id: Id91909d3a2d934b485723c0b1d2d21ab4b075b70
Signed-off-by: huiyu.eun <huiyu.eun@samsung.com>
Daekwang Ryu [Mon, 23 Jul 2018 05:35:20 +0000 (14:35 +0900)]
Merge branch 'devel/master' into tizen
Daekwang Ryu [Mon, 23 Jul 2018 05:35:11 +0000 (14:35 +0900)]
Revert "[Tizen] Restore behavior of Uploaded and LoadingFinished signal"
This reverts commit
e08f48efa79b7241264e7cb2b460245e5a9a54c6.
Daekwang Ryu [Mon, 23 Jul 2018 05:35:08 +0000 (14:35 +0900)]
Revert "[Tizen] Implement WebViewLite interface"
This reverts commit
294bc07028c6727db66be09e998d6d85819b4976.
Daekwang Ryu [Mon, 23 Jul 2018 05:35:05 +0000 (14:35 +0900)]
Revert "[Tizen] Do not substarct outline width in text-controller"
This reverts commit
a437c4f9b142c4ca00e9dd378e2968c9cb583782.
Daekwang Ryu [Mon, 23 Jul 2018 05:35:02 +0000 (14:35 +0900)]
Revert "[Tizen] Changed Control::SetLayout to handle empty layouts"
This reverts commit
ada6e4b3625f5cd0fe97abbd51c6488931456f9d.
Daekwang Ryu [Mon, 23 Jul 2018 05:35:00 +0000 (14:35 +0900)]
Revert "[Tizen] Add codes for Dali Windows Backend"
This reverts commit
a581878bf0de250859827868f64b866a7318264d.
Angelos Gkountis [Fri, 20 Jul 2018 12:30:36 +0000 (13:30 +0100)]
DALi Version 1.3.33
Change-Id: I58aa483da47b670f172a4a3856ebcc8b6a66e890
Adeel Kazmi [Thu, 19 Jul 2018 16:51:07 +0000 (17:51 +0100)]
Remove dali-csharp-wrapper.manifest
Change-Id: I2e4ce97709a324bf5fe3d17c9ef7973d38235956
Heeyong Song [Wed, 18 Jul 2018 01:18:54 +0000 (10:18 +0900)]
Fix text opacity issue
The renderer opacity value should be restored when the text opacity value is not zero.
Change-Id: Iff61b7e5665b3d083278d34fcb7701089cd48c91
Heeyong Song [Wed, 11 Jul 2018 06:20:43 +0000 (15:20 +0900)]
Fix text color issue
- Alpha values are pre-multiplied in all text cases. Don't multiply alpha in text shaders.
- Make Renderer's opacity 0 only if a text color's alpha is zero to skip rendering
Change-Id: Ie27ecf23d5b38a2234466ba4963a4a04103b5a45
Seungho, Baek [Mon, 16 Jul 2018 05:49:49 +0000 (14:49 +0900)]
[Tizen] Add codes for Dali Windows Backend
This reverts commit
3d873017c3ba94b4bfedde682ce8667bcf206527.
Seungho, Baek [Mon, 16 Jul 2018 05:49:36 +0000 (14:49 +0900)]
[Tizen] Changed Control::SetLayout to handle empty layouts
This reverts commit
e11e93080e08dec7cee84766ee13ee67d2596777.
Seungho, Baek [Mon, 16 Jul 2018 05:49:24 +0000 (14:49 +0900)]
[Tizen] Do not substarct outline width in text-controller
This reverts commit
0fb3dbb120136703255b1473c5977a18efbce721.
Seungho, Baek [Mon, 16 Jul 2018 05:49:09 +0000 (14:49 +0900)]
[Tizen] Implement WebViewLite interface
This reverts commit
ca57686512411528f93fdd1a0395dfc0d2323058.
Seungho, Baek [Mon, 16 Jul 2018 05:48:49 +0000 (14:48 +0900)]
[Tizen] Restore behavior of Uploaded and LoadingFinished signal
This reverts commit
e67e9b3d73584b1bf8274daf72fc925159011d46.
Seungho, Baek [Mon, 16 Jul 2018 05:47:53 +0000 (14:47 +0900)]
Merge branch 'devel/master' into tizen
Seungho, Baek [Mon, 16 Jul 2018 05:47:26 +0000 (14:47 +0900)]
Revert "[Tizen] Restore behavior of Uploaded and LoadingFinished signal"
This reverts commit
8025e4d0a73ed7cbdcc9be8a4423e840afa51a02.
Seungho, Baek [Mon, 16 Jul 2018 05:47:13 +0000 (14:47 +0900)]
Revert "[Tizen] Implement WebViewLite interface"
This reverts commit
fea5100412681db4ac265f59f8e3f7212c9d89fb.
Seungho, Baek [Mon, 16 Jul 2018 05:47:04 +0000 (14:47 +0900)]
Revert "[Tizen] Do not substarct outline width in text-controller"
This reverts commit
f4858327c8a12b6b5dd5d190e73dafaf82df596b.
Seungho, Baek [Mon, 16 Jul 2018 05:46:53 +0000 (14:46 +0900)]
Revert "[Tizen] Changed Control::SetLayout to handle empty layouts"
This reverts commit
b701946569ddf650fb3a4eb410bbb8a6737fa167.
Seungho, Baek [Mon, 16 Jul 2018 05:46:41 +0000 (14:46 +0900)]
Revert "[Tizen] Add codes for Dali Windows Backend"
This reverts commit
168c3a19dc98c04a513f95a7668e35d480b2e0cc.
Adeel Kazmi [Fri, 13 Jul 2018 11:53:54 +0000 (11:53 +0000)]
Merge "Apply markup properties for pre-set text" into devel/master
Adeel Kazmi [Fri, 13 Jul 2018 08:48:39 +0000 (09:48 +0100)]
DALi Version 1.3.32
Change-Id: Iffa83459f0584c4552b1fd3d44992610cee0cf41
Jinho, Lee [Mon, 6 Nov 2017 05:12:09 +0000 (14:12 +0900)]
Apply markup properties for pre-set text
Change-Id: Idbff0dabb14f643f44e2268f6db9dacd7d1e1a44
Heeyong Song [Wed, 11 Jul 2018 06:24:12 +0000 (15:24 +0900)]
Fix typo
Change-Id: I43210b09469197805ac36f8eedc71a9054af0919
Joogab Yun [Mon, 9 Jul 2018 05:14:20 +0000 (14:14 +0900)]
[Tizen] Add codes for Dali Windows Backend
This reverts commit
2ede5ddaba27cb185a417af90290eadde143f320.
Change-Id: Id50b00b3e02626db45cef96206dbc07226e7b2ca
Joogab Yun [Mon, 9 Jul 2018 05:13:58 +0000 (14:13 +0900)]
[Tizen] Changed Control::SetLayout to handle empty layouts
Change-Id: Id5e6fb1c9c38efc8a16da21fad771ff89e636d89
Joogab Yun [Mon, 9 Jul 2018 05:13:11 +0000 (14:13 +0900)]
[Tizen] Do not substarct outline width in text-controller
This reverts commit
fd93b5cc912204d4ba27e0c6aec40e230541b6b8.
Change-Id: I5b16f0dadbb38af026a32c5fd0469b7d8c859192
Joogab Yun [Mon, 9 Jul 2018 05:08:42 +0000 (14:08 +0900)]
[Tizen] Implement WebViewLite interface
This reverts commit
cfcd7943120a5634419283da12ad1d1ccdea9e27.
Change-Id: Iaf7d4d8fe7feff4bb422fe56051b0b79f87b81d5
Joogab Yun [Mon, 9 Jul 2018 05:08:21 +0000 (14:08 +0900)]
[Tizen] Restore behavior of Uploaded and LoadingFinished signal
This reverts commit
94035c7eb51a27e2791f009829a7fde17ec260e8.
Change-Id: I0728c1a55c012ac2b9b48d51f3465fbfc503e85b
Joogab Yun [Mon, 9 Jul 2018 05:08:03 +0000 (14:08 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: I44a09f34a612a4b42a4b8e873b50c321c78df06c
Joogab Yun [Mon, 9 Jul 2018 05:07:44 +0000 (14:07 +0900)]
Revert "[Tizen] Restore behavior of Uploaded and LoadingFinished signal"
This reverts commit
0dff3c4148500946802549bbf52fcd0a29c4b903.
Joogab Yun [Mon, 9 Jul 2018 05:07:40 +0000 (14:07 +0900)]
Revert "[Tizen] Implement WebViewLite interface"
This reverts commit
2071b83651be91f3b21b59c138add939b1468f66.
Joogab Yun [Mon, 9 Jul 2018 05:07:37 +0000 (14:07 +0900)]
Revert "[Tizen] Do not substarct outline width in text-controller"
This reverts commit
1cc6069b9fbd8a7af2463b5e89fd144cbb41cc49.
Joogab Yun [Mon, 9 Jul 2018 05:07:33 +0000 (14:07 +0900)]
Revert "[Tizen] Changed Control::SetLayout to handle empty layouts"
This reverts commit
2ec8c5f2b33bd2ac8e1ca84a5f9c4e9778748b2e.
Joogab Yun [Mon, 9 Jul 2018 05:07:29 +0000 (14:07 +0900)]
Revert "[Tizen] Add codes for Dali Windows Backend"
This reverts commit
53ec3e12de51d072444f302f901232bb313f98a0.
Joogab Yun [Mon, 9 Jul 2018 05:07:26 +0000 (14:07 +0900)]
Revert "[Tizen] Change dependency"
This reverts commit
fef630b929869ec7cb07f517ba3f5d57996d3eab.
Agnelo Vaz [Fri, 6 Jul 2018 09:36:34 +0000 (10:36 +0100)]
DALi Version 1.3.31
Change-Id: Icae0ebdac2ade63739e63eb0efbc8672b447e723
Adeel Kazmi [Thu, 5 Jul 2018 15:24:55 +0000 (15:24 +0000)]
Merge "Add new layouting support for TextLabel and ImageView." into devel/master
Adeel Kazmi [Thu, 5 Jul 2018 15:03:18 +0000 (15:03 +0000)]
Merge "Fix ImageView Padding and Margin issues" into devel/master
Seoyeon Kim [Tue, 19 Jun 2018 09:47:56 +0000 (18:47 +0900)]
Fix ImageView Padding and Margin issues
- Currently padding does not apply to ImageView
because the default Fitting Mode of ImageVisual have changed to FittingMode::FILL,
so ImageVisual does not transform anything on ImageView::OnRelayout().
- Trigger to call Relayout when setting Margin and Padding.
- Removed SetBackgroundVisual() in control-impl.cpp as before,
because it caused an incorrect behavior.
Change-Id: Ic9090180caec59dc5a5f0d63bbb95757f18be0ed
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
Agnelo Vaz [Mon, 2 Jul 2018 10:53:00 +0000 (11:53 +0100)]
Added test to show Order of SetLayout is not important
Change-Id: If80f4ce350504c22fa6bae70df1e519cffe98d1c
David Steele [Wed, 4 Jul 2018 11:24:53 +0000 (11:24 +0000)]
Merge "Fixed unparenting a layout item from a layout group" into devel/master
David Steele [Mon, 2 Jul 2018 15:42:11 +0000 (16:42 +0100)]
Fixed unparenting a layout item from a layout group
Unparenting a layout item from a layout group did not actually remove the
child from the parent, which if a new layout were set on a container, resulted
in the container having 2 separate layouts in it's parent layout.
Changed the Layout Parent/Child interfaces to allow LayoutItem
to remove itself from a LayoutGroup without explicitly referencing it's subclass.
Change-Id: Idf6d7813ab5a440dfbf44a8bbe46df2ca3698d64
Signed-off-by: David Steele <david.steele@samsung.com>
Anton Obzhirov [Mon, 2 Jul 2018 17:13:56 +0000 (18:13 +0100)]
Add new layouting support for TextLabel and ImageView.
Change-Id: Ic4e72c3abc397277df72f14ce2af7057536ef4d0
Adeel Kazmi [Tue, 3 Jul 2018 15:13:23 +0000 (15:13 +0000)]
Merge "Change dependency" into devel/master
David Steele [Thu, 21 Jun 2018 21:08:23 +0000 (22:08 +0100)]
Changed Control::SetLayout to handle empty layouts
Setting an empty layout now removes the layout from the control
and unparents it's children from that layout, orphaning them (removes
them from the layout hierarchy - they will no longer get measured/laid out).
Change-Id: Ice74ad251111f59c34b65f233ad288c412bb6883
Signed-off-by: David Steele <david.steele@samsung.com>
minho.sun [Fri, 20 Apr 2018 03:57:10 +0000 (12:57 +0900)]
[Tizen] Change dependency
Currently, we don't use adaptor-uv.
So don't need to give option to app which adaptor app will use.
So, make dali-toolkit directly require dali-adaptor instead of
dali-adaptor-devel.
Change-Id: I5693f5f1612e54b17282265a5b06279e01a025d2
Signed-off-by: minho.sun <minho.sun@samsung.com>
Sunghyun kim [Mon, 2 Jul 2018 07:18:31 +0000 (16:18 +0900)]
[Tizen] Add codes for Dali Windows Backend
This reverts commit
ddcecd6ec9ee3e4441fe8b0a7aba2253cef02327.
Change-Id: If5afb68ebffb73c9e53632208617d1dc023276bb
Sunghyun kim [Mon, 2 Jul 2018 07:16:31 +0000 (16:16 +0900)]
[Tizen] Changed Control::SetLayout to handle empty layouts
This reverts commit
70af9b56b598122bf7dc91adcd1ffacbb94ae733.
Conflicts:
automated-tests/src/dali-toolkit/utc-Dali-Layouting.cpp
Change-Id: I70dd03cb323c8574bd652b20b2191ce2401ea561
Sunghyun kim [Mon, 2 Jul 2018 07:10:15 +0000 (16:10 +0900)]
[Tizen] Do not substarct outline width in text-controller
This reverts commit
c4d78101ac36eae241c2b0ca7deadce0274fa56b.
Change-Id: I5d0c6db3451f9018ace8846cd0c9977f2672c0fb
Sunghyun kim [Mon, 2 Jul 2018 06:26:02 +0000 (15:26 +0900)]
[Tizen] Implement WebViewLite interface
This reverts commit
4a3b216e9168bd531fda825bbbcc5f8b8f49da5e.
Change-Id: I6adadeeefa1db34fc462a77628ba3fa08805cd8c
Sunghyun kim [Mon, 2 Jul 2018 06:24:14 +0000 (15:24 +0900)]
[Tizen] Restore behavior of Uploaded and LoadingFinished signal
This reverts commit
23abd178559a1f5970fc8a3a39b71910b8528721.
Change-Id: I2912decbfbed5daea4e7cf79bb3de1217d35e2e5
Sunghyun kim [Mon, 2 Jul 2018 06:07:05 +0000 (15:07 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: Icd9d7483fc35172caa0e3933b1b084ccadb2cbe8
Sunghyun kim [Mon, 2 Jul 2018 06:06:36 +0000 (15:06 +0900)]
Revert "[Tizen] Restore behavior of Uploaded and LoadingFinished signal"
This reverts commit
37ba97898c8099b96d7c90f01521f760e945e1d6.
Change-Id: Ieea5f8601760d0572feba770ff6a66bbd7ef10ea
Sunghyun kim [Mon, 2 Jul 2018 06:06:00 +0000 (15:06 +0900)]
Revert "[Tizen] Implement WebViewLite interface"
This reverts commit
3ee380bbbe1c004dc2954e8acd08c477596ef917.
Change-Id: I705c97cd9e3b9f1fa06247cd8f949ed10a191ffc
Sunghyun kim [Mon, 2 Jul 2018 06:05:25 +0000 (15:05 +0900)]
Revert "[Tizen] Do not substarct outline width in text-controller"
This reverts commit
a1ac009321d21baecadf3089d28967265aac1ad7.
Change-Id: If3ca2a11796664b2f858ece5f9c1dbd4c271381f
Sunghyun kim [Mon, 2 Jul 2018 06:04:45 +0000 (15:04 +0900)]
Revert "[Tizen] Changed Control::SetLayout to handle empty layouts"
This reverts commit
0c1682a0a9fe06d17a86a1de84f4ec2af6237e0d.
Change-Id: I27bd080de67ce32cd6dbb554558f8ab9c96ab9e0
Sunghyun kim [Mon, 2 Jul 2018 06:04:24 +0000 (15:04 +0900)]
Revert "[Tizen] Add codes for Dali Windows Backend"
This reverts commit
ec0ce3430f99efe79abff2ae46ce5a761730442a.
Change-Id: Ic5339f4565f97da2075f01834ad90b8dc92ce88f
Sunghyun kim [Mon, 2 Jul 2018 06:03:02 +0000 (15:03 +0900)]
Revert "[Tizen] Fix crash when Layer added to LayoutGroup"
This reverts commit
50c0ec478d8b88a97324653b4ea408a6e70810b2.
Change-Id: I8a8b32630d8c6a9c34e9eaf26d9c64e9329690bb
minho.sun [Fri, 20 Apr 2018 03:57:10 +0000 (12:57 +0900)]
Change dependency
Currently, we don't use adaptor-uv.
So don't need to give option to app which adaptor app will use.
So, make dali-toolkit directly require dali-adaptor instead of
dali-adaptor-devel.
Change-Id: Id32071301c78c114a2f67e0645a2ff92cd846c59
Signed-off-by: minho.sun <minho.sun@samsung.com>
Agnelo Vaz [Fri, 29 Jun 2018 11:02:03 +0000 (12:02 +0100)]
Prevent Control from positioning controls with margin/padding
Fixes the issue in which adding margins or padding to a Layout causes
the child control's Relayout to re-position itself using
this margin/padding.
This should be done by the layoutgroup not in Control.
Change-Id: Ic50b94f2d6c9503313ca93bfc7de413129e0824b
Adeel Kazmi [Fri, 29 Jun 2018 13:17:18 +0000 (13:17 +0000)]
Merge "DALi Version 1.3.30" into devel/master
adam.b [Fri, 29 Jun 2018 12:50:50 +0000 (13:50 +0100)]
DALi Version 1.3.30
Change-Id: Id90032a8f56dc96415f217dfb46c50f73e746b58
Anton Obzhirov [Tue, 26 Jun 2018 10:18:26 +0000 (11:18 +0100)]
Simplify and improve FlexLayout::OnChildMeasure.
Also FlexLayout::OnChildMeasure now uses LayoutGroup::GetChildMeasureSpec
to get measure spec for its children which is in line with other layouts.
Change-Id: I71a05e092e2ba524d1a1eb5ac3b0cd78fcac4797
Adeel Kazmi [Thu, 28 Jun 2018 16:33:58 +0000 (16:33 +0000)]
Merge "Use Actor target size for default layout." into devel/master
Seoyeon Kim [Thu, 28 Jun 2018 07:58:28 +0000 (16:58 +0900)]
Fix to use width and height correctly in flex-layout-impl.cpp
Change-Id: I2535ead9236099f738bf07c420eb058396eace50
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
Agnelo Vaz [Mon, 25 Jun 2018 15:13:40 +0000 (16:13 +0100)]
[Tizen] Fix crash when Layer added to LayoutGroup
Change-Id: I17ca7a07509f376ad0a49cd6015147a04886cdfe
Agnelo Vaz [Mon, 25 Jun 2018 15:13:40 +0000 (16:13 +0100)]
Fix crash when Layer added to LayoutGroup
Change-Id: I17ca7a07509f376ad0a49cd6015147a04886cdfe
Anton Obzhirov [Fri, 22 Jun 2018 10:49:23 +0000 (11:49 +0100)]
Use Actor target size for default layout.
Change-Id: I0497f5e3284e6a5e733d5dbf9ebb13c7562ba7ab
Anton Obzhirov [Mon, 25 Jun 2018 10:04:30 +0000 (11:04 +0100)]
Fix svace issues in LinearLayout.
Change-Id: If82808ed8390cc5ae9305f495ca4647cca1a8a7a
Seoyeon Kim [Mon, 25 Jun 2018 05:43:09 +0000 (14:43 +0900)]
Revert "[Tizen] Fix ImageView Padding and Margin issues"
This reverts commit
b4d349772a1e4efc51972233461c545de3c9463c.
Change-Id: I34861c0d326272f5f4e5c20892b8860ec4cd8860
David Steele [Fri, 22 Jun 2018 08:27:46 +0000 (08:27 +0000)]
Merge "DALi Version 1.3.29" into devel/master
Victor Cebollada [Fri, 22 Jun 2018 07:54:56 +0000 (08:54 +0100)]
DALi Version 1.3.29
Change-Id: Ie44c304b9b2a02db3a1dc23250ffa05d970f2fed
adun [Fri, 9 Mar 2018 02:14:59 +0000 (10:14 +0800)]
[Tizen] Add codes for Dali Windows Backend
1. Remove the unneccesary modification.
2. Move the third-part lib to windows-dependencies.
Remove unneccesary committed files.
Change-Id: Ib4b441b94ac62cf3e62dad733d659648b63c25a4
projects / platform / core / uifw / dali-toolkit.git / log