Joogab Yun [Tue, 18 Aug 2020 07:49:24 +0000 (16:49 +0900)]
Merge branch 'devel/master' into tizen
Joogab Yun [Tue, 18 Aug 2020 07:49:11 +0000 (16:49 +0900)]
Revert "[Tizen] Add AutofillContainer class and autofill implementation"
This reverts commit
c0e018284734c09f36fbe6cd701523cee08565c1.
Joogab Yun [Tue, 18 Aug 2020 07:49:09 +0000 (16:49 +0900)]
Revert "[Tizen] Revert "Changes after touch consumed behaviour change""
This reverts commit
a1ecd8fd27eed5327e6105bfe382a2652fae7551.
Adeel Kazmi [Fri, 14 Aug 2020 14:27:26 +0000 (15:27 +0100)]
Changes after TouchData renamed to TouchEvent
Change-Id: I981bd5c0296302b8cd798c96771ff8ef2a3581f9
greynaga [Fri, 14 Aug 2020 10:38:51 +0000 (11:38 +0100)]
DALi Version 1.9.25
Change-Id: I4d0d6abaa501a842048cf08dfe69b248f16b6a96
seungho [Fri, 14 Aug 2020 02:21:40 +0000 (11:21 +0900)]
[Tizen] Revert "Changes after touch consumed behaviour change"
This reverts commit
1d7629dd9f67628c53841d137125833e3d5afe97.
Change-Id: Id3d1141273b376d9cdcbcb2c4b3d9cb5d4dd5b57
David Steele [Thu, 13 Aug 2020 16:59:34 +0000 (16:59 +0000)]
Merge "Removed TouchEvent from dali-core" into devel/master
David Steele [Tue, 11 Aug 2020 16:13:29 +0000 (17:13 +0100)]
Removed TouchEvent from dali-core
Changed AccessibilityManager to use TouchData instead
Change-Id: I9fccae8a3160d4072d429b812813fcf8518b956b
Signed-off-by: David Steele <david.steele@samsung.com>
Richard Huang [Wed, 12 Aug 2020 13:34:41 +0000 (14:34 +0100)]
HoverEvent class pimpling
Change-Id: I51f03dacec165ee1d39efcf873b7c0f7bcb611db
Victor Cebollada [Mon, 10 Aug 2020 08:10:23 +0000 (09:10 +0100)]
Specified C++17 standard for the CMake projects.
Change-Id: I518c6cd79a0a92d09f132ecd7e7e5946f3e35cb2
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Wonsik Jung [Mon, 10 Aug 2020 05:41:44 +0000 (14:41 +0900)]
[Tizen] Add AutofillContainer class and autofill implementation
This reverts commit
81e71fbb8b248ea7a8ce8c967a24495fd7cd79b9.
Wonsik Jung [Mon, 10 Aug 2020 05:41:31 +0000 (14:41 +0900)]
Merge branch 'devel/master' into tizen
Wonsik Jung [Mon, 10 Aug 2020 05:40:46 +0000 (14:40 +0900)]
Revert "[Tizen] Add AutofillContainer class and autofill implementation"
This reverts commit
94315db8e597e03e9796ca94b46a27c63375ae34.
Wonsik Jung [Mon, 10 Aug 2020 05:40:42 +0000 (14:40 +0900)]
Revert "[Tizen] There is an issue with scale, so change to LINEAR."
This reverts commit
71b7443c9a26b10f8bb1057b6e2c8658eb1f1b1f.
Adeel Kazmi [Fri, 7 Aug 2020 14:50:30 +0000 (14:50 +0000)]
Merge "DALi Version 1.9.24" into devel/master
David Steele [Fri, 7 Aug 2020 14:42:08 +0000 (15:42 +0100)]
DALi Version 1.9.24
Change-Id: If9fcb65f3b27bc85f2f99c7f441289c3482c41c4
Adeel Kazmi [Fri, 7 Aug 2020 14:06:30 +0000 (14:06 +0000)]
Merge "No longer using std::unary_function<>." into devel/master
Seoyeon Kim [Fri, 7 Aug 2020 01:25:34 +0000 (01:25 +0000)]
Merge "Add a TextEditor property to limit input to maximum characters" into devel/master
Adeel Kazmi [Thu, 6 Aug 2020 16:01:12 +0000 (16:01 +0000)]
Merge "Add move semantics to toolkit Window" into devel/master
Richard Huang [Thu, 6 Aug 2020 14:22:32 +0000 (15:22 +0100)]
Add move semantics to toolkit Window
Change-Id: I055c275ce957dd545ccff40c439467df3f2ef518
György Straub [Thu, 6 Aug 2020 09:14:45 +0000 (10:14 +0100)]
No longer using std::unary_function<>.
It is removed as of C++17.
Change-Id: I1fa47528de13bb9d541cbb3b6b48addfb0fd5e79
Signed-off-by: György Straub <g.straub@partner.samsung.com>
Seoyeon Kim [Thu, 6 Aug 2020 04:15:51 +0000 (13:15 +0900)]
Add a TextEditor property to limit input to maximum characters
- Added MAX_LENGTH property and MaxLengthReachedSignal to TextEditor
Change-Id: I55f97302ff3f60f878ac438a014bb7d967dfdf32
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
Adeel Kazmi [Wed, 5 Aug 2020 12:42:53 +0000 (13:42 +0100)]
Use static_assert instead of DALI_COMPILE_TIME_ASSERT
Change-Id: I5ff15e12d50da50e9198f0e6b51eacc296d51e33
joogab yun [Wed, 5 Aug 2020 08:56:12 +0000 (08:56 +0000)]
Merge "add minLineSize at text-utils-devel" into devel/master
Shinwoo Kim [Wed, 5 Aug 2020 05:34:33 +0000 (14:34 +0900)]
fix typo
Change-Id: I1cf7cf6c1fbcdbf8652cd772e4e6578ec3610607
Richard Huang [Tue, 4 Aug 2020 11:12:17 +0000 (12:12 +0100)]
Rename OnStage signals and related internal changes
Change-Id: I26d60319eeb22cd31640eefc0b40cbcd750e3a8a
Joogab Yun [Tue, 4 Aug 2020 08:29:17 +0000 (17:29 +0900)]
add minLineSize at text-utils-devel
Change-Id: I1a11d35283b8f7b4cf14b0ae40487307b24e0a0a
Cheng-Shiun Tsai [Fri, 31 Jul 2020 10:11:15 +0000 (11:11 +0100)]
DALi Version 1.9.23
Change-Id: Ic89882142ed68f863a0c1d53bde2e02ecea66a17
Adeel Kazmi [Thu, 30 Jul 2020 16:41:05 +0000 (16:41 +0000)]
Merge "Add move semantics to common and base Toolkit classes" into devel/master
Adeel Kazmi [Thu, 30 Jul 2020 16:41:00 +0000 (16:41 +0000)]
Merge "Changes after touch consumed behaviour change" into devel/master
Adeel Kazmi [Tue, 28 Jul 2020 17:59:40 +0000 (18:59 +0100)]
Changes after touch consumed behaviour change
Change-Id: I789630deb72157ae4016eccc96636155fb7c3af4
joogab yun [Thu, 30 Jul 2020 07:51:08 +0000 (07:51 +0000)]
Merge "There is an issue with scale, so change to LINEAR. and fixed pixel alignment issue also." into devel/master
Joogab Yun [Wed, 29 Jul 2020 04:33:04 +0000 (13:33 +0900)]
There is an issue with scale, so change to LINEAR.
and fixed pixel alignment issue also.
Change-Id: I8fb79eafd58714b1f2fcb42d650b7f6a1ca4eeea
Richard Huang [Wed, 29 Jul 2020 14:33:38 +0000 (15:33 +0100)]
Add move semantics to common and base Toolkit classes
Change-Id: I45a75274e668d12a15c07b9b3282613d56cfc192
Joogab Yun [Wed, 29 Jul 2020 07:23:55 +0000 (16:23 +0900)]
[Tizen] There is an issue with scale, so change to LINEAR.
Change-Id: I3da6af5084846a5f28270db875eb16e8dde0ce41
Heeyong Song [Wed, 29 Jul 2020 05:59:18 +0000 (14:59 +0900)]
Fix memory leak
Need to clear image loading tasks
Change-Id: I2d6edde3b7932fdcc22d5569c2f10de296a80ff7
Adeel Kazmi [Mon, 27 Jul 2020 19:15:56 +0000 (20:15 +0100)]
Add a test to check the default Control OnPinch method
Change-Id: If8478f4e0e98b31357f9f53d6f4432e3b7c863cf
Seoyeon Kim [Thu, 23 Jul 2020 10:57:10 +0000 (19:57 +0900)]
Reset the number of characters to add in deleting all texts
Change-Id: Icc5681a75eb9ed93afb2741b08861cb2974000cf
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
Heeyong Song [Mon, 27 Jul 2020 06:33:32 +0000 (15:33 +0900)]
[Tizen] Add AutofillContainer class and autofill implementation
Change-Id: Id692f31a8f66941f77af5849dfee7b3081d4f636
Heeyong Song [Mon, 27 Jul 2020 06:33:09 +0000 (15:33 +0900)]
Merge branch 'devel/master' into tizen
Change-Id: I52d808ab4c2f52da99fea9492efd853f9273cd0c
Heeyong Song [Mon, 27 Jul 2020 06:30:19 +0000 (15:30 +0900)]
Revert "[Tizen] Add AutofillContainer class and autofill implementation"
This reverts commit
b5a1e732437fe8e9a3ccf6826dd1a1a3ef9b5731.
Change-Id: I24eae5dd55f224829771b90e77cc8864f72f1331
Adeel Kazmi [Fri, 24 Jul 2020 15:38:59 +0000 (15:38 +0000)]
Merge "Rendering optimisation with AddOn" into devel/master
Adeel Kazmi [Fri, 24 Jul 2020 11:58:48 +0000 (11:58 +0000)]
Merge "Updates for NativeImageInterface" into devel/master
adam.b [Tue, 21 Jul 2020 10:34:15 +0000 (11:34 +0100)]
Rendering optimisation with AddOn
To enable, the external addon is required.
Change-Id: I932f0fedd157ac00cd6b564ebf7fdb08bd22cc5a
Adeel Kazmi [Fri, 24 Jul 2020 10:13:31 +0000 (10:13 +0000)]
Merge "DALi Version 1.9.22" into devel/master
Richard Huang [Fri, 24 Jul 2020 09:48:24 +0000 (10:48 +0100)]
DALi Version 1.9.22
Change-Id: Ibe6e29d3c8f15840628ce427d41267fe472f6a6f
Wonsik Jung [Thu, 11 Jun 2020 05:52:18 +0000 (14:52 +0900)]
Add the synchronization between Ui and Video player
This patch is to support the synchronization between video player and UI.
To do that, video player's changing function as resize/move should be called before calling eglSwapBuffers.
Change-Id: Icfe0e0c2fee9d65a9df10827ed91faf38b09e720
Heeyong Song [Wed, 22 Jul 2020 00:48:49 +0000 (00:48 +0000)]
Merge "Do not request relayout when a control background color is changed" into devel/master
David Steele [Mon, 20 Jul 2020 17:21:40 +0000 (18:21 +0100)]
Updates for NativeImageInterface
Change-Id: Ieb86dd9c36babb27357b7074ce33802e97ea8992
Daekwang Ryu [Tue, 21 Jul 2020 06:33:52 +0000 (15:33 +0900)]
[Tizen] Add AutofillContainer class and autofill implementation
This reverts commit
c7f8552229061384a12a4b14075dfb5ee87a1f2d.
Daekwang Ryu [Tue, 21 Jul 2020 06:20:49 +0000 (15:20 +0900)]
Merge branch 'devel/master' into tizen
Daekwang Ryu [Tue, 21 Jul 2020 06:20:26 +0000 (15:20 +0900)]
Revert "[Tizen] Add AutofillContainer class and autofill implementation"
This reverts commit
1a741b2948434669075e13293d9f2d86a962b486.
joogab yun [Tue, 21 Jul 2020 01:51:03 +0000 (01:51 +0000)]
Merge "Corrects the position. This required correction as the advance value changed after the patch https://review.tizen.org/gerrit/#/c/platform/core/uifw/dali-adaptor/+/236448/" into devel/master
Victor Cebollada [Mon, 20 Jul 2020 14:23:07 +0000 (15:23 +0100)]
Remove unused CMakeLists.txt file
Change-Id: If6d321a5ad49a3793505dc1654426090e0a95dd2
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Heeyong Song [Fri, 17 Jul 2020 10:06:52 +0000 (19:06 +0900)]
Do not request relayout when a control background color is changed
Change-Id: I9047335cf832d956615feed53826e5e5557acac3
Joogab Yun [Tue, 14 Jul 2020 07:33:59 +0000 (16:33 +0900)]
Corrects the position.
This required correction as the advance value changed after the patch
https://review.tizen.org/gerrit/#/c/platform/core/uifw/dali-adaptor/+/236448/
And after applying this patch, there is a pixel alignment issue in TextField.
So I add a sampler NEAREST.
Change-Id: I314cd9bf5d4db9a2b7ab04b6581ac63dd1bd886a
Adeel Kazmi [Fri, 17 Jul 2020 17:17:31 +0000 (18:17 +0100)]
(Automated Tests) Fix compilation error in tests caused by 07e964a "CORNER_RADIUS_POLICY" change
Change-Id: I188713d290d9d83c1589516a7dc950b9b7e7f4ec
Adeel Kazmi [Fri, 17 Jul 2020 12:41:34 +0000 (12:41 +0000)]
Merge "DALi Version 1.9.21" into devel/master
adam.b [Fri, 17 Jul 2020 12:12:07 +0000 (13:12 +0100)]
DALi Version 1.9.21
Change-Id: I8bccb88fa2f0b1bba91c25ff3302b50b22b3fab4
Heeyong Song [Fri, 17 Jul 2020 03:14:35 +0000 (03:14 +0000)]
Merge "(Visual) Support CORNER_RADIUS_POLICY" into devel/master
Dongsug Song [Thu, 16 Jul 2020 23:46:30 +0000 (08:46 +0900)]
Revert "[Tizen] Restore OnControlChildAdd and OnControlChildRemove"
- This was workaround patch to fix CSFS not shown issue, but this was resolved by rebuilding dali-extension-tv module.
- This is not required and need to be reverted.
This reverts commit
078980aea975d398c7e6eb24387d5beb1255a435.
Change-Id: I9142922a52be3eee1b9b7f0992ddb7705b4cc733
Heeyong Song [Thu, 16 Jul 2020 09:54:06 +0000 (18:54 +0900)]
[Tizen] Restore OnControlChildAdd and OnControlChildRemove
Change-Id: I2205277de96eef1df25751c56405d74b97548bd6
Adeel Kazmi [Tue, 14 Jul 2020 20:44:13 +0000 (21:44 +0100)]
Changes after Stage moved to Devel API
Change-Id: I196c1948a7f87cd2a04f04e31fe901284170d48e
Adeel Kazmi [Wed, 15 Jul 2020 11:33:26 +0000 (11:33 +0000)]
Merge changes I73656a3e,Ic6a1d6e9 into devel/master
* changes:
windows: Fix .pdb debug symbol file installation
tree-node.h: Include string header file
Adeel Kazmi [Wed, 15 Jul 2020 10:41:30 +0000 (10:41 +0000)]
Merge "(Automated Tests) Get ObjectRegistry from Core rather than Stage" into devel/master
Wander Lairson Costa [Mon, 13 Jul 2020 19:12:25 +0000 (16:12 -0300)]
windows: Fix .pdb debug symbol file installation
On Windows, the pdb symbol file is located inside the `Debug`
subdirectory.
Change-Id: I73656a3e0740e68d4ffbecf4820de634ab398b24
Wander Lairson Costa [Mon, 13 Jul 2020 19:14:56 +0000 (16:14 -0300)]
tree-node.h: Include string header file
msvc compiler complains about using std::string without the proper
inclusion of the header file.
Change-Id: Ic6a1d6e9745cb99822e61304f47285ecbaef0bc7
Minho Sun [Wed, 15 Jul 2020 05:28:40 +0000 (05:28 +0000)]
Merge "Add child property support for FlexLayout" into devel/master
Adeel Kazmi [Tue, 14 Jul 2020 14:44:41 +0000 (15:44 +0100)]
(Automated Tests) Get ObjectRegistry from Core rather than Stage
Change-Id: Ie18c3aa3994e79b2eb41e1b881260442b3921618
Yeongjong Lee [Mon, 6 Jul 2020 08:24:49 +0000 (17:24 +0900)]
Add child property support for FlexLayout
Child properties are added for FlexLayout.
- FlexAlignmentSelf
- FlexPositionType
- FlexAspectRatio
- FlexBasis
- FlexShrink
- FlexGrow
See also,
dali-toolkit: https://review.tizen.org/gerrit/#/c/platform/core/uifw/dali-toolkit/+/237889/
dali-csharp-binder: https://review.tizen.org/gerrit/#/c/platform/core/uifw/dali-csharp-binder/+/237888/
NUI: https://github.com/Samsung/TizenFX/pull/1803
Change-Id: I5b9265931150c7c497e707624b3cdbe981b3a25b
Seungho BAEK [Tue, 14 Jul 2020 09:12:36 +0000 (09:12 +0000)]
Merge "Automated TC modify. To make minimum batch size and cache size 2" into devel/master
Heeyong Song [Thu, 25 Jun 2020 07:25:55 +0000 (16:25 +0900)]
(Visual) Support CORNER_RADIUS_POLICY
Change-Id: I83b9f75f040da83d776e6987cb0450d527348eb9
Seungho, Baek [Tue, 14 Jul 2020 08:56:08 +0000 (17:56 +0900)]
[Tizen] Add AutofillContainer class and autofill implementation
This reverts commit
fddab4a3e912ba5d22879b95c5dc27e38202a0d5.
Change-Id: Ia6ff3027be0bbe228426a87d675a5111775e0e0f
Seungho, Baek [Tue, 14 Jul 2020 08:55:15 +0000 (17:55 +0900)]
Merge branch 'devel/master' into tizen
Seungho, Baek [Tue, 14 Jul 2020 08:55:11 +0000 (17:55 +0900)]
Revert "[Tizen] Add AutofillContainer class and autofill implementation"
This reverts commit
e54ba3a5e56b4d2058932ad65b1db22c4b31c112.
Seungho, Baek [Tue, 14 Jul 2020 08:55:07 +0000 (17:55 +0900)]
Revert "[Tizen] Add npatch utility"
This reverts commit
20b0fc0fe0ad40a16ef9f0993b6225666f921129.
Seungho, Baek [Mon, 13 Jul 2020 07:01:11 +0000 (16:01 +0900)]
Automated TC modify. To make minimum batch size and cache size 2
Change-Id: Id3966860b839dbf9c02bb77c4d04b1b9902a77f4
Signed-off-by: Seungho, Baek <sbsh.baek@samsung.com>
Adeel Kazmi [Mon, 13 Jul 2020 18:10:36 +0000 (19:10 +0100)]
(Automated Tests) Use Scene instead of Stage
Change-Id: I2c703e035e338a0879c5ce71d88484d0b7dd9131
Adeel Kazmi [Mon, 13 Jul 2020 21:42:07 +0000 (21:42 +0000)]
Merge "(Automated Tests) Changes after Window changes in Adaptor" into devel/master
Adeel Kazmi [Mon, 13 Jul 2020 13:39:49 +0000 (13:39 +0000)]
Merge "Add GetLastCharacterIndex()." into devel/master
Heeyong Song [Mon, 13 Jul 2020 06:19:45 +0000 (06:19 +0000)]
Merge "(Vector) Ensure not to add duplicated task" into devel/master
Joogab Yun [Fri, 10 Jul 2020 06:14:55 +0000 (15:14 +0900)]
Add GetLastCharacterIndex().
This returns the last character indices when the input text is rendered with the layout size.
Change-Id: I9f6ff3226a3aeb94c19d3ad69aabc8e017f99cbe
joogab yun [Mon, 13 Jul 2020 01:17:01 +0000 (01:17 +0000)]
Merge "Divide Render() into small apis" into devel/master
Adeel Kazmi [Wed, 8 Jul 2020 17:13:03 +0000 (18:13 +0100)]
(Automated Tests) Changes after Window changes in Adaptor
Change-Id: I072408e718712dce63e1fe8bdc9ecc2894a05299
Joogab Yun [Thu, 9 Jul 2020 09:37:43 +0000 (18:37 +0900)]
Divide Render() into small apis
Change-Id: If20f7a5cef20386e2aeb00cf1d3e283b10da3e93
Adeel Kazmi [Fri, 10 Jul 2020 08:38:47 +0000 (09:38 +0100)]
DALi Version 1.9.20
Change-Id: Ib8f90fa629a7bf31ac600c983cef46ca0b548075
Adeel Kazmi [Thu, 9 Jul 2020 16:44:41 +0000 (16:44 +0000)]
Merge "Call LoadTexture() for ReleasePolicy" into devel/master
Adeel Kazmi [Thu, 9 Jul 2020 16:33:20 +0000 (16:33 +0000)]
Merge "Support Asynchronous Loading of Animated Image" into devel/master
Richard Huang [Wed, 8 Jul 2020 16:59:21 +0000 (17:59 +0100)]
Support weak handle for BaseHandle
Change-Id: Id351d09ba06d9dee380db4f760fc4ee98536da44
Sunghyun Kim [Thu, 2 Jul 2020 04:57:58 +0000 (13:57 +0900)]
Call LoadTexture() for ReleasePolicy
When ReleasePolicy is not DETACHED, There are cases where the wrong
texture is seen.
To avoid this case, i added a patch.
Detailed description is added below.
Load Texture if mTextures is empty.
mTextures is already set, the mTexture can be used to create Renderer.
There are two cases mTextures is empty.
1. mTextureId == TextureManager::INVALID_TEXTURE_ID and mTextures is empty
- Visual is on stage with LoadPolicy::ATTACHED
- mTextureId != TextureManager::INVALID_TEXTURE_ID and mTextures is empty
- If ReleasePolicy is DESTROYED, InitializeRenderer called every on stage called.
- Then every resources those contained in Visual are Reset but mTextureId is remained when the Off stage time,
- So, mTextures needed to be get from texture manager to created resources like mImpl->mRenderer.
Change-Id: Ice111ee467eaeba222eaa9063bde3b23ada484d4
Heeyong Song [Mon, 6 Jul 2020 06:41:28 +0000 (15:41 +0900)]
(Vector) Ensure not to add duplicated task
Change-Id: I3f023b6615ca36b40ddc3534fd8faab7985eb08e
Seungho, Baek [Fri, 19 Jun 2020 11:46:15 +0000 (20:46 +0900)]
Support Asynchronous Loading of Animated Image
Change-Id: I31670a301cd7f69a68a9c0c75ef6b62d9b587482
Signed-off-by: Seungho, Baek <sbsh.baek@samsung.com>
Adeel Kazmi [Fri, 3 Jul 2020 10:58:43 +0000 (10:58 +0000)]
Merge "Remove non-touch related deprecated APIs" into devel/master
Victor Cebollada [Fri, 3 Jul 2020 08:51:33 +0000 (09:51 +0100)]
DALi Version 1.9.19
Change-Id: I97b59f740480cde828b983b8d2d26a2cedc0fda9
Richard Huang [Thu, 2 Jul 2020 09:52:19 +0000 (10:52 +0100)]
Remove non-touch related deprecated APIs
Change-Id: Ibed037aa0140b0d7c13fe360f09a86b876dac04b
Adeel Kazmi [Tue, 30 Jun 2020 15:48:44 +0000 (16:48 +0100)]
Fixed SVACE error in TextVisual
Change-Id: Icf15764d48b0b879577451172bced309bfffada4
Heeyong Song [Mon, 22 Jun 2020 08:36:17 +0000 (17:36 +0900)]
[Tizen] Add npatch utility
Change-Id: I31cece8e4a1f85c515038f66a9afa3b697e7a112
Victor Cebollada [Fri, 26 Jun 2020 14:44:13 +0000 (15:44 +0100)]
Fixes for the CMake build on MS-Windows.
Change-Id: I4812a6292521f777c3e020130c84da794b8f007e
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
György Straub [Fri, 26 Jun 2020 08:09:27 +0000 (09:09 +0100)]
DALi Version 1.9.18
Change-Id: I5f1af070115868e83dfb625d0d4252d3d2072348
sunghyun kim [Thu, 25 Jun 2020 02:41:02 +0000 (02:41 +0000)]
Merge "Change not to use the mask if it is set to an empty path" into devel/master