admin [Mon, 3 Feb 2020 15:55:38 +0000 (15:55 +0000)]
Merge remote-tracking branch 'origin/master' into tizen
jh8801jung [Mon, 3 Feb 2020 01:09:04 +0000 (10:09 +0900)]
[NFC] Fix TC failed issue : the SEH exception occurs (#1326)
* [NFC] Fix TC failed issue : the SEH exception occurs
Signed-off-by: Jihoon Jung <jh8801.jung@samsung.com>
* Free IntPtr from capi
Signed-off-by: Jihoon Jung <jh8801.jung@samsung.com>
* Replace free method
Signed-off-by: Jihoon Jung <jh8801.jung@samsung.com>
admin [Fri, 31 Jan 2020 15:55:28 +0000 (15:55 +0000)]
Release 8.0.0.15092
admin [Fri, 31 Jan 2020 15:55:27 +0000 (15:55 +0000)]
Merge remote-tracking branch 'origin/master' into tizen
dongsug-song [Fri, 31 Jan 2020 05:06:02 +0000 (14:06 +0900)]
[NUI] Fix Tizen.NUI.Samples crash error when it is terminated (#1353)
admin [Thu, 30 Jan 2020 15:55:19 +0000 (15:55 +0000)]
Release 8.0.0.15091
admin [Thu, 30 Jan 2020 15:55:19 +0000 (15:55 +0000)]
Merge remote-tracking branch 'origin/master' into tizen
neostom432 [Thu, 30 Jan 2020 05:16:49 +0000 (14:16 +0900)]
[NUI] Add ScrollToIndex to ScrollableBase (#1352)
* [NUI] Add ScrollToIndex to ScrollableBase
Scrolls to the item at the specified index.
* [NUI] Use position instead of Size for calculating scrolling position
Co-authored-by: krown <neostom432@nate.com>
dongsug-song [Thu, 30 Jan 2020 04:06:45 +0000 (13:06 +0900)]
[NUI] Fix AlphaMaskUrl setting order problem (#1349)
admin [Wed, 29 Jan 2020 15:55:10 +0000 (15:55 +0000)]
Release 8.0.0.15089
admin [Wed, 29 Jan 2020 15:55:10 +0000 (15:55 +0000)]
Merge remote-tracking branch 'origin/master' into tizen
neostom432 [Wed, 29 Jan 2020 11:32:37 +0000 (20:32 +0900)]
[NUI] Add GaussianBlurView (#1344)
* [NUI] Add GaussianBlurView
Add GaussianBlurView.
For now user can use this class internally, because APIs are all hidden.
* [NUI] make private function to internal in GaussianBlurView
Co-authored-by: krown <neostom432@nate.com>
huiyueun [Wed, 29 Jan 2020 03:57:01 +0000 (12:57 +0900)]
[NUI] Fix NUI svace issue (#1343)
Signed-off-by: huiyu.eun <huiyu.eun@samsung.com>
admin [Thu, 23 Jan 2020 15:55:17 +0000 (15:55 +0000)]
Release 8.0.0.15087
admin [Thu, 23 Jan 2020 15:55:17 +0000 (15:55 +0000)]
Merge remote-tracking branch 'origin/master' into tizen
dongsug-song [Wed, 22 Jan 2020 23:46:08 +0000 (08:46 +0900)]
[NUI] Add dispose checking in just a few methods of Timer class (#1340)
admin [Tue, 21 Jan 2020 15:55:13 +0000 (15:55 +0000)]
Release 8.0.0.15086
admin [Tue, 21 Jan 2020 15:55:13 +0000 (15:55 +0000)]
Merge remote-tracking branch 'origin/master' into tizen
Jiyun Yang [Tue, 21 Jan 2020 03:17:17 +0000 (12:17 +0900)]
[NUI] Support Shadow Size Extents (#1325)
Signed-off-by: Jiyun Yang <ji.yang@samsung.com>
agnelovaz [Tue, 21 Jan 2020 02:31:13 +0000 (02:31 +0000)]
[NUI] Fix reparenting of Child bug (#1314)
If a child is added to a different layout the transition finished
animation can cause it to be removed from the new parent.
Cause : The removal animation is added to the stack, the add animation is added to
the stack. Animations are run. When animations finish the itemRemovalQueue is run, this
removes the child as the removal code added it to the itemRemovalQueue.
Fix : In the case of replacement, set a flag on the child so the removal code can excluded it
from the itemRemovalQueue.
Change-Id: Ib7da9e446c990258c8415e584bbb624dae4d6fa5
neostom432 [Tue, 21 Jan 2020 02:21:33 +0000 (11:21 +0900)]
[NUI] Add/change scroll event (#1331)
* [NUI] Add/change scroll event
ScrollStartDragEvent - Emitted when panning is start
ScrollEndDragEvent - Emitted when panning is end
ScrollAnimationStartEvent - Emitted when scroll animation is start
ScrollAnimationEndEvent - Emitted when scroll animation is end
* [NUI] change name of scroll event and its comment
Co-authored-by: krown <neostom432@nate.com>
admin [Mon, 20 Jan 2020 15:55:23 +0000 (15:55 +0000)]
Release 8.0.0.15083
admin [Mon, 20 Jan 2020 15:55:23 +0000 (15:55 +0000)]
Merge remote-tracking branch 'origin/master' into tizen
Xianbing Teng [Mon, 20 Jan 2020 11:10:41 +0000 (19:10 +0800)]
[NUI.Components] Fix svace issues (#1309)
neostom432 [Mon, 20 Jan 2020 07:16:19 +0000 (16:16 +0900)]
[NUI] Fixed GridLayout scrolling issue (#1324)
When using GridLayout view with ScrollableBase, it cannot be scrolled.
It cauesd by wrong height measurement and it only happend when setting
WrapContent to layout view.
Save measurement result when using WrapContent.
Co-authored-by: krown <neostom432@nate.com>
huiyueun [Mon, 20 Jan 2020 01:52:39 +0000 (10:52 +0900)]
[NUI] Fix FittingMode bug (#1318)
Signed-off-by: huiyu.eun <huiyu.eun@samsung.com>
admin [Fri, 17 Jan 2020 15:55:22 +0000 (15:55 +0000)]
Release 8.0.0.15080
admin [Fri, 17 Jan 2020 15:55:21 +0000 (15:55 +0000)]
Merge remote-tracking branch 'origin/master' into tizen
Jiyun Yang [Fri, 17 Jan 2020 06:03:15 +0000 (15:03 +0900)]
[NUI] Control handle state `Pressed` (#1313)
Signed-off-by: Jiyun Yang <ji.yang@samsung.com>
admin [Wed, 15 Jan 2020 15:58:22 +0000 (15:58 +0000)]
Release 8.0.0.15079
admin [Wed, 15 Jan 2020 15:58:22 +0000 (15:58 +0000)]
Merge remote-tracking branch 'origin/master' into tizen
neostom432 [Wed, 15 Jan 2020 06:18:18 +0000 (15:18 +0900)]
[NUI] Remove default LayoutTransition (#1306)
Remove default LayoutTransition.
Co-authored-by: krown <neostom432@nate.com>
Jiyun Yang [Wed, 15 Jan 2020 06:05:09 +0000 (15:05 +0900)]
[NUI] Clean shadow related properties from Control and sample (#1297)
Signed-off-by: Jiyun Yang <ji.yang@samsung.com>
Xianbing Teng [Wed, 15 Jan 2020 05:58:26 +0000 (13:58 +0800)]
[NUI.Components] Remove InputField (#1283)
admin [Wed, 15 Jan 2020 03:32:25 +0000 (03:32 +0000)]
Release 8.0.0.15076
admin [Wed, 15 Jan 2020 03:32:25 +0000 (03:32 +0000)]
Merge remote-tracking branch 'origin/master' into tizen
MuHong Byun [Wed, 15 Jan 2020 02:24:09 +0000 (11:24 +0900)]
[Sensor] Sync with API7 branch (#1303)
* [Sensor] Add auto rotation sensor
Signed-off-by: MuHong Byun <mh.byun@samsung.com>
* [Sensor] Addition of initial sensor values (#1153)
* addition of initial sensor values
* method name changed
* addition of ReadData() method in sensor class
* comment updated
* adding abstract method
* change in access modifier
* access modifier changed
Co-authored-by: pvschakradhar <48746416+pvschakradhar@users.noreply.github.com>
admin [Wed, 15 Jan 2020 01:08:04 +0000 (01:08 +0000)]
Release 8.0.0.15075
admin [Wed, 15 Jan 2020 01:08:02 +0000 (01:08 +0000)]
Merge remote-tracking branch 'origin/master' into tizen
admin [Mon, 13 Jan 2020 15:53:34 +0000 (15:53 +0000)]
Release 7.0.0.15071
admin [Mon, 13 Jan 2020 15:53:33 +0000 (15:53 +0000)]
Merge remote-tracking branch 'origin/API7' into tizen
Seungkeun Lee [Mon, 13 Jan 2020 08:37:00 +0000 (17:37 +0900)]
[Application] Fix widget instance id bug (#1197)
* Fix widget instance id bug
* Update Introp method name
neostom432 [Mon, 13 Jan 2020 08:19:42 +0000 (17:19 +0900)]
[NUI] Add ScrollEnabled property to ScrollableBase (#1301)
* [NUI] Add ScrollEnabled property to ScrollableBase
User can disable / enable scrolling using this property.
* [NUI] Add CurrentPage property to ScrollableBase
Can get current page of ScrollableBase when using SnapToPage mode.
Co-authored-by: krown <neostom432@nate.com>
neostom432 [Mon, 13 Jan 2020 08:19:05 +0000 (17:19 +0900)]
[NUI] Add ScrollEnabled property to ScrollableBase (#1300)
* [NUI] Add ScrollEnabled property to ScrollableBase
User can disable / enable scrolling using this property.
* [NUI] Add CurrentPage property to ScrollableBase
Can get current page of ScrollableBase when using SnapToPage mode.
Co-authored-by: krown <neostom432@nate.com>
MuHong Byun [Mon, 13 Jan 2020 05:11:59 +0000 (14:11 +0900)]
[Sensor] Add auto rotation sensor (#1193)
Signed-off-by: MuHong Byun <mh.byun@samsung.com>
neostom432 [Fri, 10 Jan 2020 05:03:35 +0000 (14:03 +0900)]
[NUI] Initialize pan direction of ScrollableBase to Vertical (#1292)
Initialize pan direction to Vertical in constructor of ScrollableBase.
Co-authored-by: krown <neostom432@nate.com>
neostom432 [Fri, 10 Jan 2020 05:03:13 +0000 (14:03 +0900)]
[NUI] Initialize pan direction of ScrollableBase to Vertical (#1293)
Initialize pan direction to Vertical in constructor of ScrollableBase.
Co-authored-by: krown <neostom432@nate.com>
dongsug-song [Fri, 10 Jan 2020 04:25:44 +0000 (13:25 +0900)]
[NUI] Fix SetMinMaxFrameByMarker()'s not working issue in AnimatedVectorImageView (#1294)
dongsug-song [Fri, 10 Jan 2020 04:25:31 +0000 (13:25 +0900)]
[NUI] Fix SetMinMaxFrameByMarker()'s not working issue in AnimatedVectorImageView (#1295)
Xianbing Teng [Thu, 9 Jan 2020 09:44:12 +0000 (17:44 +0800)]
[NUI] Fix extents issue and unified style format (#1287)
* [NUI] Fix extents issue and unified style format
* [NUI] Add null value check
* [NUI] Fix null value check issue
Xianbing Teng [Thu, 9 Jan 2020 09:43:08 +0000 (17:43 +0800)]
[NUI] Fix extents issue and unified style format (#1279)
* [NUI] Fix extents issue and unified style format
* [NUI] Add null value check
* [NUI] Fix null value check issue
zhouleonlei [Thu, 9 Jan 2020 06:47:43 +0000 (14:47 +0800)]
[NUI] Implement switch's Old background API (#1289)
zhouleonlei [Thu, 9 Jan 2020 06:47:08 +0000 (14:47 +0800)]
[NUI] Implement switch's Old background API (#1290)
zhouleonlei [Wed, 8 Jan 2020 12:10:46 +0000 (20:10 +0800)]
[NUI] Fix background blank issue of Switch (#1282)
zhouleonlei [Wed, 8 Jan 2020 12:09:27 +0000 (20:09 +0800)]
[NUI] Fix background blank issue of Switch (#1281)
Jiyun Yang [Mon, 6 Jan 2020 09:23:26 +0000 (18:23 +0900)]
[NUI] Add Shadow properties to ViewStyle (#1277)
Signed-off-by: Jiyun Yang <ji.yang@samsung.com>
Jiyun Yang [Mon, 6 Jan 2020 09:23:08 +0000 (18:23 +0900)]
[NUI] Add Shadow properties to ViewStyle (#1276)
Signed-off-by: Jiyun Yang <ji.yang@samsung.com>
zhouleonlei [Mon, 6 Jan 2020 04:22:55 +0000 (12:22 +0800)]
[NUI] Fixed the type conversion issue which cause TCT failed (#1275)
zhouleonlei [Mon, 6 Jan 2020 04:22:11 +0000 (12:22 +0800)]
[NUI] Fixed the type conversion issue which cause TCT failed (#1273)
Jiyun Yang [Fri, 3 Jan 2020 08:52:16 +0000 (17:52 +0900)]
[NUI] Update Shadow property : add Clone method (#1271)
Signed-off-by: Jiyun Yang <ji.yang@samsung.com>
Jiyun Yang [Fri, 3 Jan 2020 08:50:00 +0000 (17:50 +0900)]
[NUI] Update Shadow property : add Clone method (#1270)
Signed-off-by: Jiyun Yang <ji.yang@samsung.com>
Jiyun Yang [Fri, 3 Jan 2020 08:05:19 +0000 (17:05 +0900)]
[NUI] Enable BackgroundImageBorder in View (#1268)
Signed-off-by: Jiyun Yang <ji.yang@samsung.com>
Jiyun Yang [Fri, 3 Jan 2020 08:05:01 +0000 (17:05 +0900)]
[NUI] Enable BackgroundImageBorder in View (#1267)
Signed-off-by: Jiyun Yang <ji.yang@samsung.com>
Jiyun Yang [Fri, 3 Jan 2020 04:59:53 +0000 (13:59 +0900)]
[NUI] Fix the issue that the property binding in View are not working properly. (#1259) (#1266)
Signed-off-by: Jiyun Yang <ji.yang@samsung.com>
Jiyun Yang [Fri, 3 Jan 2020 04:50:46 +0000 (13:50 +0900)]
[NUI] Fix the issue that the property binding in View are not working properly. (#1259)
Signed-off-by: Jiyun Yang <ji.yang@samsung.com>
zhouleonlei [Fri, 3 Jan 2020 04:50:09 +0000 (12:50 +0800)]
[NUI] Implement the old API of Popup.SetButtonText for Manual.Tests failed (#1261)
zhouleonlei [Fri, 3 Jan 2020 04:49:43 +0000 (12:49 +0800)]
[NUI] Implement the old API of Popup.SetButtonText for Manual.Tests failed (#1262)
huayongxu [Mon, 30 Dec 2019 09:41:01 +0000 (17:41 +0800)]
fix crash when cube transition effect sample is launched. (#1254)
Wonsik Jung [Fri, 27 Dec 2019 09:59:49 +0000 (18:59 +0900)]
[NUI] Add to get current window orientation. (#1251)
Add the API to get current window orientation.
It is to return the logical orientation
Wonsik Jung [Fri, 27 Dec 2019 09:59:14 +0000 (18:59 +0900)]
[NUI] Add to get current window orientation. (#1249)
Add the API to get current window orientation.
It is to return the logical orientation
Xianbing Teng [Fri, 27 Dec 2019 08:10:32 +0000 (16:10 +0800)]
[NUI.Components] Fix Background Image not works issue (#1246) (#1248)
Xianbing Teng [Fri, 27 Dec 2019 07:56:13 +0000 (15:56 +0800)]
[NUI.Components] Fix Background Image not works issue (#1246)
dongsug-song [Thu, 26 Dec 2019 07:34:11 +0000 (16:34 +0900)]
[NUI] Add SetMinMaxFrameByMarker() in LottieAnimationView (#1244)
Xianbing Teng [Thu, 26 Dec 2019 07:08:47 +0000 (15:08 +0800)]
[NUI.Components] Fix BackgroundImage doesn't works issue (#1240) (#1243)
Xianbing Teng [Thu, 26 Dec 2019 06:37:30 +0000 (14:37 +0800)]
[NUI.Components] Fix BackgroundImage doesn't works issue (#1240)
Xianbing Teng [Tue, 24 Dec 2019 08:32:57 +0000 (16:32 +0800)]
[NUI.Components] Fix build warnings (#1233) (#1238)
Xianbing Teng [Tue, 24 Dec 2019 08:14:34 +0000 (16:14 +0800)]
[NUI.Components] Fix build warnings (#1233)
Jiyun Yang [Tue, 24 Dec 2019 08:12:25 +0000 (17:12 +0900)]
[NUI] Implement shadow in View (#1236)
Signed-off-by: Jiyun Yang <ji.yang@samsung.com>
Jiyun Yang [Tue, 24 Dec 2019 07:59:12 +0000 (16:59 +0900)]
[NUI] Implement shadow in View (#1223)
Signed-off-by: Jiyun Yang <ji.yang@samsung.com>
neostom432 [Mon, 23 Dec 2019 10:16:59 +0000 (19:16 +0900)]
[NUI] Fix Dropdown runtime error (#1232)
Reviewed and Verified with Sample
neostom432 [Mon, 23 Dec 2019 10:16:32 +0000 (19:16 +0900)]
[NUI] Fix Dropdown runtime error (#1231)
Reviewed and Verified with Sample
dongsug-song [Mon, 23 Dec 2019 07:07:55 +0000 (16:07 +0900)]
[NUI] Add AnimatedImageView for AGIF and Image-Array as HiddenAPI (#1227) (#1228)
dongsug-song [Mon, 23 Dec 2019 06:46:14 +0000 (15:46 +0900)]
[NUI] Add AnimatedImageView for AGIF and Image-Array as HiddenAPI (#1227)
dongsug-song [Fri, 20 Dec 2019 11:24:52 +0000 (20:24 +0900)]
[NUI] NUI samples (#1225)
* [NUI] Initial upload the samples of NUI and NUI.Components (#1207)
* [NUI] Merge NUI.Samples to TizenFX (#1222)
* [NUI] Revise NUI samples (#1224)
Co-authored-by: zhouleonlei <56956725+zhouleonlei@users.noreply.github.com>
dongsug-song [Fri, 20 Dec 2019 10:43:35 +0000 (19:43 +0900)]
[NUI] Revise NUI samples (#1224)
agnelovaz [Thu, 19 Dec 2019 12:40:50 +0000 (12:40 +0000)]
[NUI] Layout scroller pages api7 (#1186)
* [NUI.Components] LayoutScroller flick added
Flick support
Configurable Flick animation
Ensuring uniform duration of flick animation by removing flick multipler
Change-Id: Ib654a38cb2070c29520069a75b5782d458ab4da6
* [NUI.Components] Horizontal Scroll supported
* [NUI.Components] LayoutScroller with horizontal Pages support
Other features added:
FlickDurationModifier renamed to FlickAnimationSpeed
Defaults changed so faster.
Uses View API for Add/Remove child instead of the new dedicated API.
ScrollStart and ScrollEnd signals added
Vertical and Horizontal axis enums to set Horizontal or Vertical scrolling
Fixes:
Tap gesture doesn't stop pages scrolling mid way.
Flick in Pages should not stack pages changes. Must wait until scroll ended to flick again.
Change-Id: I8dcabff1e956b747987865ceb4272ccb2ce55061
* [NUI.Components] LayoutScroller renamed to Scrollable
Change-Id: I42805c3b240997d1921db4b3c1008b120d264cbb
* [NUI.Components] Scrollable derives from NUI.Components.Control
Change-Id: Iec6f083fe4601ceff40f74bbe1ae8de4d8da6917
* [NUI.Components] Scrollable Pages MatchParent fix
Fixed bug in which the Scrollable would be the size of it's content
even when set to MatchParent
Change-Id: I2be91b1a6f975b4e8aa2a132dc63009a21ef4b62
* [NUI] Rename component
Rename component Scrollable -> Scroll
* [NUI.Components] rename Scroll to ScrollableBase
* [NUI.Components] change PanGesture direction when scrolling direction is changed
When scrolling direction is changed, pan gesture direction should be changed.
This change makes ScrollableBase support nested list cases.
agnelovaz [Thu, 19 Dec 2019 12:39:59 +0000 (12:39 +0000)]
[NUI.Components] Layout scroller/Scrollable Horizontal support and Pages (#1184)
* [NUI.Components] LayoutScroller flick added
Flick support
Configurable Flick animation
Ensuring uniform duration of flick animation by removing flick multipler
Change-Id: Ib654a38cb2070c29520069a75b5782d458ab4da6
* [NUI.Components] Horizontal Scroll supported
* [NUI.Components] LayoutScroller with horizontal Pages support
Other features added:
FlickDurationModifier renamed to FlickAnimationSpeed
Defaults changed so faster.
Uses View API for Add/Remove child instead of the new dedicated API.
ScrollStart and ScrollEnd signals added
Vertical and Horizontal axis enums to set Horizontal or Vertical scrolling
Fixes:
Tap gesture doesn't stop pages scrolling mid way.
Flick in Pages should not stack pages changes. Must wait until scroll ended to flick again.
Change-Id: I8dcabff1e956b747987865ceb4272ccb2ce55061
* [NUI.Components] LayoutScroller renamed to Scrollable
Change-Id: I42805c3b240997d1921db4b3c1008b120d264cbb
* [NUI.Components] Scrollable derives from NUI.Components.Control
Change-Id: Iec6f083fe4601ceff40f74bbe1ae8de4d8da6917
* [NUI.Components] Scrollable Pages MatchParent fix
Fixed bug in which the Scrollable would be the size of it's content
even when set to MatchParent
Change-Id: I2be91b1a6f975b4e8aa2a132dc63009a21ef4b62
* [NUI] Rename component
Rename component Scrollable -> Scroll
* [NUI.Components] rename Scroll to ScrollableBase
* [NUI.Components] change PanGesture direction when scrolling direction is changed
When scrolling direction is changed, pan gesture direction should be changed.
This change makes ScrollableBase support nested list cases.
zhouleonlei [Thu, 19 Dec 2019 10:44:41 +0000 (18:44 +0800)]
[NUI] Merge NUI.Samples to TizenFX (#1222)
AdunFang [Thu, 19 Dec 2019 10:32:40 +0000 (18:32 +0800)]
[NUI] Fix crash issue when creat popup (#1189)
Wonsik Jung [Thu, 19 Dec 2019 09:24:31 +0000 (18:24 +0900)]
[NUI] Add NoOrientationPreference (#1220)
Add NoOrientationPreference to WindowOrientation enum.
It is used to unset the preferred orientation with SetPreferredOrientation.
Wonsik Jung [Thu, 19 Dec 2019 09:23:40 +0000 (18:23 +0900)]
[NUI] Add NoOrientationPreference (#1219)
Add NoOrientationPreference to WindowOrientation enum.
It is used to unset the preferred orientation with SetPreferredOrientation.
Xianbing Teng [Thu, 19 Dec 2019 09:15:30 +0000 (17:15 +0800)]
[NUI] Fix textfield color issue (#1213)
Xianbing Teng [Thu, 19 Dec 2019 09:15:02 +0000 (17:15 +0800)]
[NUI] Fix textfield color issue (#1211)
neostom432 [Thu, 19 Dec 2019 06:59:01 +0000 (15:59 +0900)]
[NUI] Support adding multiple callback to gesture (#1216)
* NUIWidgetApplication constructor for multi widget
Add new constructor for multi widget.
Previously, NUIWidgetApplication had constructor for single widget.
Now, we can support multi widget so add constructor for this.
* [NUI] Support adding multiple callback to gesture
neostom432 [Thu, 19 Dec 2019 06:54:46 +0000 (15:54 +0900)]
[NUI] Support adding multiple callback to gesture (#1215)
dongsug-song [Thu, 19 Dec 2019 02:09:40 +0000 (11:09 +0900)]
[NUI] Initial upload the samples of NUI and NUI.Components (#1207)
dongsug-song [Thu, 19 Dec 2019 02:09:25 +0000 (11:09 +0900)]
[NUI] Add SetMinMaxFrameByMarker() in LottieAnimationView (#1210)
zhouleonlei [Wed, 18 Dec 2019 10:14:13 +0000 (18:14 +0800)]
[NUI] Merge master#1206 to API7 (#1209)
zhouleonlei [Wed, 18 Dec 2019 09:18:00 +0000 (17:18 +0800)]
[NUI] Sync the whole codes to master (#1206)
* [NUI] Sync the whole codes to master
* [NUI] add EditorBrowsableState.Never for ButtonGroup
zhouleonlei [Wed, 18 Dec 2019 06:57:04 +0000 (14:57 +0800)]
[NUI] Merge master#1199 to API7 (#1205)