Adeel Kazmi [Fri, 14 Feb 2020 07:31:21 +0000 (07:31 +0000)]
[dali_1.5.0] Merge branch 'devel/master'
Change-Id: I3852d3fcc049175b09b70c5b332558c494ad3a16
Adeel Kazmi [Fri, 14 Feb 2020 07:30:25 +0000 (07:30 +0000)]
DALi Version 1.5.0
Change-Id: Id9e2ec9a084f8dcc7ef5de693f03bcba9e1cbb9b
Adeel Kazmi [Thu, 13 Feb 2020 16:06:04 +0000 (16:06 +0000)]
Merge "(patch-coverage.pl) Ignore header files that yield no coverage" into devel/master
Adeel Kazmi [Thu, 13 Feb 2020 09:55:58 +0000 (09:55 +0000)]
(patch-coverage.pl) Ignore header files that yield no coverage
Change-Id: I8e1fe875d300fa028bd2f6844422a4fd38f6d3ad
Heeyong Song [Wed, 12 Feb 2020 06:56:20 +0000 (15:56 +0900)]
Add log for image file loading failure
Change-Id: If5bffc5563be5aefd9c6177fb2feaf1985aaece4
Adeel Kazmi [Tue, 11 Feb 2020 12:45:09 +0000 (12:45 +0000)]
Remove unused Retention policy
Change-Id: Ia053d91a4043be116108e52b6590e0c5b0d1d6bf
Anton Obzhirov [Thu, 6 Feb 2020 14:31:31 +0000 (14:31 +0000)]
[dali_1.4.57] Merge branch 'devel/master'
Change-Id: I2b7334af0ef3d29f6f44130ae4be1ff91604c771
Anton Obzhirov [Thu, 6 Feb 2020 14:30:36 +0000 (14:30 +0000)]
DALi Version 1.4.57
Change-Id: I2196449a911d2e2399b882a7b1b0fea10389d121
Joogab Yun [Wed, 5 Feb 2020 11:05:01 +0000 (20:05 +0900)]
Modify UtcDaliTextControllerMaxLengthSetText()
It takes too long to create a string of maxLength. Improve this.
Change-Id: Ic2bb10cc37d5b58c4c246307de336829a32a9bb4
Heeyong Song [Thu, 16 Jan 2020 05:55:02 +0000 (14:55 +0900)]
Remove the texture element from the load queue
The observer can be deleted before the load queue is processed.
Remove the load element from the queue when the texture is removed.
Change-Id: I290d82b1f6b77db915f400af4cd2c05e0bd9558b
Heeyong Song [Fri, 31 Jan 2020 07:52:07 +0000 (16:52 +0900)]
Emit ResourceReady signal in SvgVisual in case of loading failure
Change-Id: I0f52fb5f298b5cfe1b5e13eb78c330b044d55149
adam.b [Fri, 31 Jan 2020 11:13:58 +0000 (11:13 +0000)]
[dali_1.4.56] Merge branch 'devel/master'
Change-Id: I0617796f91568a48a0823f00258abcf38c6ed14d
adam.b [Fri, 31 Jan 2020 11:13:03 +0000 (11:13 +0000)]
DALi Version 1.4.56
Change-Id: Icdc415f3a0d5881649580fffb0d6d4a68fad53fb
huiyu.eun [Thu, 30 Jan 2020 03:13:50 +0000 (12:13 +0900)]
Set mParsedImage of svg-visual
Change-Id: I76eb44ee5862968ddb6cb4049c62b8cb78a0bedd
Signed-off-by: huiyu.eun <huiyu.eun@samsung.com>
huiyu.eun [Mon, 30 Dec 2019 04:23:27 +0000 (13:23 +0900)]
Download remote svg file
Change-Id: I115ba51843a448015b3c136de0570a3078a92ab6
Signed-off-by: huiyu.eun <huiyu.eun@samsung.com>
Seoyeon Kim [Tue, 28 Jan 2020 00:59:53 +0000 (00:59 +0000)]
Merge "Fix Coverity issue" into devel/master
Victor Cebollada [Fri, 24 Jan 2020 13:50:22 +0000 (13:50 +0000)]
[dali_1.4.55] Merge branch 'devel/master'
Change-Id: Ia67ce58118fe187787bcbffbef98b63bc0f20cc9
Victor Cebollada [Fri, 24 Jan 2020 13:49:37 +0000 (13:49 +0000)]
DALi Version 1.4.55
Change-Id: Iaadea46217c2618b72571cb7840a520fbda8498a
Adeel Kazmi [Fri, 24 Jan 2020 08:44:12 +0000 (08:44 +0000)]
Automated Tests Sync
Change-Id: Id67435bb5de6e169efbfbe4650c6d5a4b7a06647
Adeel Kazmi [Thu, 23 Jan 2020 17:00:10 +0000 (17:00 +0000)]
Merge "Syncing common test files." into devel/master
Adeel Kazmi [Thu, 23 Jan 2020 16:52:32 +0000 (16:52 +0000)]
Merge "VCPKG - CMakeLists.txt updated to build for vcpkg." into devel/master
Victor Cebollada [Mon, 13 Jan 2020 15:20:41 +0000 (15:20 +0000)]
VCPKG - CMakeLists.txt updated to build for vcpkg.
Change-Id: Idf08d9283e4a054bbbfb5b9b07fdc168adbba973
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
György Straub [Thu, 16 Jan 2020 13:18:40 +0000 (13:18 +0000)]
Syncing common test files.
As required by change I0b4cc593ab5e40b17dc427956cd78950ab49e5ae on dali-core.
Change-Id: Ib5f72aef86fe7e9f5d98cf8d7546f1888c030725
Signed-off-by: György Straub <g.straub@partner.samsung.com>
Adeel Kazmi [Thu, 23 Jan 2020 14:30:30 +0000 (14:30 +0000)]
Merge "Add last clear color API in test gl abstraction." into devel/master
Seoyeon Kim [Wed, 22 Jan 2020 06:37:52 +0000 (15:37 +0900)]
Fix Coverity issue
- If the variable 'pixelFormat' is deliberately set to RGB16F or RGB32F,
then Pixel::GetBytesPerPixel() returns 12u or 24u.
- Then, 'Out-of-bound' error may occur because the return value exceeds
the scope of 'outputColor' array.
Change-Id: I5674b20d8976b925e12444eb9fc611e0d5633f49
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
Adeel Kazmi [Wed, 22 Jan 2020 09:18:31 +0000 (09:18 +0000)]
Merge "Add TextField BACKGROUND property and more Preedit style options" into devel/master
Seoyeon Kim [Wed, 27 Nov 2019 05:47:25 +0000 (14:47 +0900)]
Add TextField BACKGROUND property and more Preedit style options
Change-Id: Ia4ce089bbee50bac45542268ef9ddaada8c9a657
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
Adeel Kazmi [Tue, 21 Jan 2020 14:17:57 +0000 (14:17 +0000)]
Merge "MS Windows - Fix compile error when debug is enabled." into devel/master
Heeyong Song [Tue, 24 Dec 2019 07:32:54 +0000 (16:32 +0900)]
(Vector) Stop the animation when the actor is off-stage or invisible
Change-Id: I3b29c64943cc4a52898725ce2e983dd386069867
Anton Obzhirov [Mon, 20 Jan 2020 10:44:03 +0000 (10:44 +0000)]
Add last clear color API in test gl abstraction.
Change-Id: Iba05e95e975bef915b3d440df94bd80f1c420053
Heeyong Song [Mon, 20 Jan 2020 04:09:49 +0000 (13:09 +0900)]
Fix an issue not to unload alpha mask texture
ImageVisual needs the alpha mask texture id to unload the texture
Change-Id: I6fe7a1b362cfbba27cdc9eba7e9ec3b3bcee087d
Victor Cebollada [Fri, 17 Jan 2020 08:55:41 +0000 (08:55 +0000)]
MS Windows - Fix compile error when debug is enabled.
* Builds with VCPKG
Change-Id: Idbe5a597fcdfb309e29a729ffba381ffd56b6f27
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Adeel Kazmi [Fri, 17 Jan 2020 11:14:13 +0000 (11:14 +0000)]
Merge "DALi Version 1.4.54" into devel/master
György Straub [Fri, 17 Jan 2020 08:49:25 +0000 (08:49 +0000)]
[dali_1.4.54] Merge branch 'devel/master'
Change-Id: Ie64e46022308183a60b5dedaaa9b3854ea1a1181
György Straub [Fri, 17 Jan 2020 08:48:40 +0000 (08:48 +0000)]
DALi Version 1.4.54
Change-Id: I9ebc4c389c63ad1c53532b63d6cab0dbd7951850
joogab yun [Fri, 17 Jan 2020 01:19:54 +0000 (01:19 +0000)]
Merge "Add api for get the internal media player handle of the VideoView" into devel/master
György Straub [Thu, 16 Jan 2020 11:21:22 +0000 (11:21 +0000)]
Updated automated-tests' README.md with more specific instructions / caveats.
Change-Id: Ia1f6863a516cbb4e8325fd1bb61af60b1bfd629e
Signed-off-by: György Straub <g.straub@partner.samsung.com>
Joogab Yun [Wed, 15 Jan 2020 06:11:27 +0000 (15:11 +0900)]
Ellipsis sometimes appears incorrect when mixed with RTL + LTR
sample)
textRTL = TextLabel::New("فصل 3 قسط 6 - Line of Duty");
textRTL.SetAnchorPoint( AnchorPoint::TOP_LEFT );
textRTL.SetSize( 320, 200.f);
textRTL.SetProperty( TextLabel::Property::POINT_SIZE, 20.f);
textRTL.SetPosition( 50.f, 300.f);
stage.Add( textRTL );
Change-Id: Ice8186431b6914286a99366a8c3347529dbb0c1c
Joogab Yun [Mon, 13 Jan 2020 08:17:54 +0000 (17:17 +0900)]
Add api for get the internal media player handle of the VideoView
Change-Id: I1671caaa688038c6ee15622c72317b4c90487b98
Seungho, Baek [Mon, 28 Oct 2019 01:41:52 +0000 (10:41 +0900)]
Add AlphaMask to synchronousLoading
Change-Id: I23d5021f31aeb928a899f0c2caaa680ea3a165d9
Signed-off-by: Seungho, Baek <sbsh.baek@samsung.com>
Joogab Yun [Sat, 11 Jan 2020 22:37:02 +0000 (07:37 +0900)]
TextFit : modified it work even if you change the size
// text fit test
Property::Map backgroundMap;
backgroundMap["color"] = Color::RED;
backgroundMap["enable"] = true;
Property::Map textFitMap;
textFitMap["enable"] = true;
textFitMap["minSize"] = 10.f;
textFitMap["maxSize"] = 60.f;
textFitMap["stepSize"] = 4.f;
textFitMap["fontSizeType"] = "pointSize";
width = 700;
height = 100;
textFit = TextLabel::New( "Long enough message for TextLabel!! This is a Text Fit sample text " );
textFit.SetSize( width, height );
textFit.SetParentOrigin(ParentOrigin::TOP_LEFT);
textFit.SetAnchorPoint(AnchorPoint::TOP_LEFT);
textFit.SetPosition( 100.f, 300.f);
textFit.SetProperty( Toolkit::DevelTextLabel::Property::TEXT_FIT, textFitMap );
textFit.SetProperty( Toolkit::DevelTextLabel::Property::BACKGROUND, backgroundMap );
stage.Add( textFit );
stage.KeyEventSignal().Connect( this, &HelloWorldController::OnKeyEvent );
}
void OnKeyEvent( const KeyEvent& event )
{
if( event.state == KeyEvent::Down )
{
width -= 40;
textFit.SetSize( width, height );
}
}
Change-Id: Ie7f3cd5cc5e0fa581f8e4912ccb5e88049499f31
Adeel Kazmi [Fri, 10 Jan 2020 15:58:46 +0000 (15:58 +0000)]
Merge "Updated NanoSVG to latest version (22 April 2019)" into devel/master
Richard Huang [Fri, 10 Jan 2020 15:09:23 +0000 (15:09 +0000)]
Fix svg memory issue
- fix heap-buffer-overflow issue
- nsvgParse : Parses SVG file from a null terminated string
Change-Id: Ie462dd63b03ba212b5e67c89406fb477f83f0692
Richard Huang [Fri, 10 Jan 2020 14:10:23 +0000 (14:10 +0000)]
Updated NanoSVG to latest version (22 April 2019)
Change-Id: I3a4082a0afe6411ac197d87bf5a706d8b97e5ab6
greynaga [Fri, 10 Jan 2020 11:51:02 +0000 (11:51 +0000)]
[dali_1.4.53] Merge branch 'devel/master'
Change-Id: I5954ee76d62a46751a1c652d2a10003d66adecdd
greynaga [Fri, 10 Jan 2020 11:50:17 +0000 (11:50 +0000)]
DALi Version 1.4.53
Change-Id: I04835b40e38831129fcc281a35b2d1ae0e731b7b
Adeel Kazmi [Thu, 9 Jan 2020 17:23:57 +0000 (17:23 +0000)]
Merge "Fix random crash in TCT when stderr is closed but we try to write to it" into devel/master
Richard Huang [Wed, 8 Jan 2020 10:30:42 +0000 (10:30 +0000)]
Fix random crash in TCT when stderr is closed but we try to write to it
Change-Id: If854285fa64582f81625b78a814dcfa61c3a5a2c
Adeel Kazmi [Tue, 7 Jan 2020 16:16:15 +0000 (16:16 +0000)]
GCC 9.2 Support
Change-Id: I40fd353eac0a66d4000d4c94e254b4cd02670140
Agnelo Vaz [Fri, 3 Jan 2020 11:47:05 +0000 (11:47 +0000)]
Fixing 4 SVACE errors
Dereference of null pointer
Asserts if unsigned ints not greater or equal to zero
Change-Id: Ief535cdd8fe70e2e0deed3f721e612bb2a7facb0
Adeel Kazmi [Fri, 3 Jan 2020 11:35:45 +0000 (11:35 +0000)]
Merge "DALi Version 1.4.52" into devel/master
Richard Huang [Fri, 3 Jan 2020 11:07:33 +0000 (11:07 +0000)]
[dali_1.4.52] Merge branch 'devel/master'
Change-Id: I028f65fb860bea38e712221b2101cd4ff2bf8153
Richard Huang [Fri, 3 Jan 2020 11:06:49 +0000 (11:06 +0000)]
DALi Version 1.4.52
Change-Id: I21e81fd9ef5106f01f75e49b5c10786b50f48c60
Seoyeon Kim [Thu, 2 Jan 2020 10:00:02 +0000 (19:00 +0900)]
Change the state of EventData to EDITING in RemoveText
- Currently, in certain cases, even if Backspace key is pressed
after cursor blink is stopped, cursor blink does not restart and
the cursor is also not shown.
- It means, after EventData is changed to INACTIVE state due to
KeyboardFocusLostEvent(), StopCursorBlink() is called.
After that, in RemoveText(), which is called in Backspace key,
EventData cannot be changed to EDITING state and StartCursorBlink() is not called.
On the other hand, when the character commits or the arrow keys are pressed,
EventData is changed to EDITING state and the cursor is displayed on screen.
- So, added 'ChangeState( EventData::EDITING )' when the state is INACTIVE.
Change-Id: Ib79dfdc6f7308d084772f62dc49918a694cfc438
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
Joogab Yun [Fri, 27 Dec 2019 06:10:55 +0000 (15:10 +0900)]
sscanf() returns incorrect results depending on the locale.
So, to use nsvg__atof () to get the correct value.
*this patch is taken from the latest nanosvg source.
Change-Id: I157e26edc1e4a3aedec5fb86043a9beba7e71489
Jiyun Yang [Tue, 24 Dec 2019 05:43:36 +0000 (14:43 +0900)]
Move shadow APIs to Internal::Control::Impl from Internal::Control
Change-Id: I86bef469e54996bb83fddfa3b36d07970549d227
Signed-off-by: Jiyun Yang <ji.yang@samsung.com>
Heeyong Song [Wed, 18 Dec 2019 10:55:57 +0000 (19:55 +0900)]
(Vector) Ensure the current frame is not out of the play range
Change-Id: I7077b0de7133f4282b66d2c4de2a1ce6b8555256
Adeel Kazmi [Fri, 20 Dec 2019 10:46:07 +0000 (10:46 +0000)]
Merge "DALi Version 1.4.51" into devel/master
Cheng-Shiun Tsai [Fri, 20 Dec 2019 10:33:55 +0000 (10:33 +0000)]
[dali_1.4.51] Merge branch 'devel/master'
Change-Id: Icf8c6960214dc5139adfacdcceef61359007d053
Cheng-Shiun Tsai [Fri, 20 Dec 2019 10:33:00 +0000 (10:33 +0000)]
DALi Version 1.4.51
Change-Id: I70d64760f7298bfdcb132ba9a27ee452a93b96c8
HyunJu Shin [Fri, 20 Dec 2019 09:57:27 +0000 (09:57 +0000)]
Merge "Add property SHADOW to Control" into devel/master
Seoyeon Kim [Wed, 18 Dec 2019 10:29:24 +0000 (19:29 +0900)]
Update tizen document URL
- According to the address change of tizen documents,
the site URL in dali-toolkit-doc.h has been updated.
Change-Id: Ief8d5b9425bf995e9171c66c37893d800aeab4e1
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
Jiyun Yang [Wed, 18 Dec 2019 05:52:32 +0000 (14:52 +0900)]
Add property SHADOW to Control
* The SHADOW will take a set of properties as a map type
* Same as BACKGROUND, it can be any type of visuals
Change-Id: I0b203929021f2c2cda01af4131a9f3f0baaa86ac
Signed-off-by: Jiyun Yang <ji.yang@samsung.com>
Heeyong Song [Fri, 13 Dec 2019 05:16:06 +0000 (14:16 +0900)]
(Vector) Support marker
Change-Id: I0962a3c144d34374352c9759933448df07d00b8e
Agnelo Vaz [Fri, 13 Dec 2019 10:58:19 +0000 (10:58 +0000)]
[dali_1.4.50] Merge branch 'devel/master'
Change-Id: I91fcfde38ca82817b4001f5675b2ccca314ddf7e
Agnelo Vaz [Fri, 13 Dec 2019 10:57:23 +0000 (10:57 +0000)]
DALi Version 1.4.50
Change-Id: I51d279df003917709cd9c117e742d077eeb4f63a
Heeyong Song [Fri, 29 Nov 2019 08:12:02 +0000 (17:12 +0900)]
Fix npatch loader issue
The pixel pointer should be updated after ParseRange method.
Use reference of a pointer
Change-Id: I35b711c73faa5b7a36f5f3dc70825e6fbf4c955a
Paul Wisbey [Thu, 5 Dec 2019 16:11:32 +0000 (16:11 +0000)]
Merge "Change svg visual to load file using adaptor platform API." into devel/master
Anton Obzhirov [Thu, 5 Dec 2019 11:54:31 +0000 (11:54 +0000)]
[dali_1.4.49] Merge branch 'devel/master'
Change-Id: I98ab9e86e9abfdc597880f24e63fefec37597ba9
Anton Obzhirov [Thu, 5 Dec 2019 11:53:31 +0000 (11:53 +0000)]
DALi Version 1.4.49
Change-Id: I5ae98626feeaa4b7fa477bd5e3767ab4cd481502
Anton Obzhirov [Wed, 4 Dec 2019 15:22:51 +0000 (15:22 +0000)]
Change svg visual to load file using adaptor platform API.
Change-Id: I840d4064c38fe9b4622342b8f53718cbc60b4c09
joogab yun [Mon, 2 Dec 2019 01:20:09 +0000 (01:20 +0000)]
Merge "GetLineCount() after GetTextDirection() returns wrong value." into devel/master
Adeel Kazmi [Fri, 29 Nov 2019 17:02:22 +0000 (17:02 +0000)]
Merge "Multiple text background color support for left-to-right text only in TextField" into devel/master
Richard Huang [Tue, 26 Nov 2019 16:45:43 +0000 (16:45 +0000)]
Multiple text background color support for left-to-right text only in TextField
Change-Id: I9beee6072fb72997c94b05b3d1cfebe9ee1217bb
Adeel Kazmi [Fri, 29 Nov 2019 13:32:09 +0000 (13:32 +0000)]
Merge "DALi Version 1.4.48" into devel/master
adam.b [Fri, 29 Nov 2019 12:17:49 +0000 (12:17 +0000)]
[dali_1.4.48] Merge branch 'devel/master'
Change-Id: I82684ca0f34ed01fdf9ebc9a03edecdd1063d038
adam.b [Fri, 29 Nov 2019 12:17:05 +0000 (12:17 +0000)]
DALi Version 1.4.48
Change-Id: I1f4e36b96591cb4ccfa0777b29453f07acf8cbfb
Sunghyun kim [Fri, 29 Nov 2019 01:20:01 +0000 (10:20 +0900)]
Avoid stackoverflow in nanosvg
Change-Id: I508a5573e747114176f3bd37b2c77835edbfa7ca
joogab yun [Tue, 26 Nov 2019 07:31:40 +0000 (07:31 +0000)]
Merge "Layout fixes." into devel/master
joogab yun [Tue, 26 Nov 2019 07:31:34 +0000 (07:31 +0000)]
Merge "Text cleaning." into devel/master
Heeyong Song [Mon, 25 Nov 2019 04:42:42 +0000 (13:42 +0900)]
(Vector) Call Finalize method instead of deleting VectorRenderer
Change-Id: Id7d0a5cab4229e6619122c6294914d512bae9b17
Victor Cebollada [Tue, 8 Oct 2019 08:31:18 +0000 (09:31 +0100)]
Layout fixes.
* Fixes some alignment issues with RTL text.
* Reorders the RTL lines while the text is laid-out.
It might happen that the length of the text changes after
the reordering. In that case if the lines are reordered
outside the layout engine update the lenght at that
step is too late.
Change-Id: If7b3bf488bde75c538a646aa48b7dfe3083597b8
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Victor Cebollada [Fri, 1 Nov 2019 10:42:26 +0000 (10:42 +0000)]
Text cleaning.
* Refactor the Layout::Parameters struct
* Remove unnecesary code.
Change-Id: I1ebd7a01b3d7fe33917d51c481b536118c5c9bae
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Adeel Kazmi [Fri, 22 Nov 2019 08:02:21 +0000 (08:02 +0000)]
Merge "DALi Version 1.4.47" into devel/master
Victor Cebollada [Fri, 22 Nov 2019 07:15:08 +0000 (07:15 +0000)]
[dali_1.4.47] Merge branch 'devel/master'
Change-Id: Icbe305fff35ed76718f15db8ab9247fc1a95e10e
Victor Cebollada [Fri, 22 Nov 2019 07:14:21 +0000 (07:14 +0000)]
DALi Version 1.4.47
Change-Id: I1b5be5e37a66667841bbc28b615ae1629a4f51db
joogab yun [Fri, 22 Nov 2019 01:22:39 +0000 (01:22 +0000)]
Merge "Reset Preedit variables in 'Delete All' state" into devel/master
Adeel Kazmi [Fri, 15 Nov 2019 22:05:40 +0000 (22:05 +0000)]
(FlexNode) Fixed Visual Studio Compilation
Change-Id: I063802197a4eb31a5be1439b5332b7c0273c9a83
Adeel Kazmi [Fri, 15 Nov 2019 14:08:41 +0000 (14:08 +0000)]
Merge "DALi Version 1.4.46" into devel/master
Richard Huang [Fri, 15 Nov 2019 14:04:10 +0000 (14:04 +0000)]
[dali_1.4.46] Merge branch 'devel/master'
Change-Id: I3a569a344fda9ad54872c1b5d5c676fc7ea14e41
Richard Huang [Fri, 15 Nov 2019 14:03:14 +0000 (14:03 +0000)]
DALi Version 1.4.46
Change-Id: Ide56b38d2a9e283733000d579f8dded7b6fb8707
Heeyong Song [Thu, 14 Nov 2019 08:21:25 +0000 (17:21 +0900)]
Fix text jitter issue
Text jitter issue occurs when set a text again during text scrolling.
It is because the same property is used by the old and new animations. 2 PropertyResetters affect the same property.
So I've changed to use properties of Shader which is newly created every time.
Then the same property is not used by the old and new animation now.
Change-Id: I7ec9b266b0be48414d8df5e3ffead6e5c750b338
Adeel Kazmi [Fri, 8 Nov 2019 13:11:04 +0000 (13:11 +0000)]
Merge "Add new style for 2048x1080 high dpi." into devel/master
Anton Obzhirov [Fri, 8 Nov 2019 12:41:07 +0000 (12:41 +0000)]
Add new style for 2048x1080 high dpi.
Change-Id: I2ead85d585050c5cb19c7fd4f9a65c55b86f8ddf
György Straub [Fri, 8 Nov 2019 09:45:30 +0000 (09:45 +0000)]
[dali_1.4.45] Merge branch 'devel/master'
Change-Id: I35171759924bf849053ec0f91d69129e92ceb8d6
György Straub [Fri, 8 Nov 2019 09:44:37 +0000 (09:44 +0000)]
DALi Version 1.4.45
Change-Id: I0de6884326fb78322b8b50b2717f43ef66b9c2eb
Joogab Yun [Wed, 6 Nov 2019 01:57:57 +0000 (10:57 +0900)]
GetLineCount() after GetTextDirection() returns wrong value.
ex)
I expect the line count to come out of 3.
However, after GetProperty(TEXT_DIRECTION), line count is 1.
labelLine = TextLabel::New();
labelLine.SetSize( 400, 200 );
labelLine.SetParentOrigin(ParentOrigin::TOP_LEFT);
labelLine.SetAnchorPoint(AnchorPoint::TOP_LEFT);
labelLine.SetPosition( 830.f, 800.f);
labelLine.SetProperty(TextLabel::Property::POINT_SIZE, 23.f);
labelLine.SetProperty(Dali::Toolkit::TextLabel::Property::TEXT, "Original text Original text Original text Original text");
labelLine.SetProperty( TextLabel::Property::MULTI_LINE, true );
stage.Add( labelLine );
stage.KeyEventSignal().Connect( this, &HelloWorldController::LineCount );
void LineCount( const KeyEvent& event )
{
if( event.state == KeyEvent::Down )
{
// issue
labelLine.SetProperty(Dali::Toolkit::TextLabel::Property::TEXT, "Changed1 text Changed text Changed text Changed text");
DALI_LOG_ERROR("lineCount #11: %d \n",labelLine.GetProperty<int>( TextLabel::Property::LINE_COUNT ));
labelLine.GetProperty< int >( DevelTextLabel::Property::TEXT_DIRECTION );
DALI_LOG_ERROR("lineCount #22: %d \n",labelLine.GetProperty<int>( TextLabel::Property::LINE_COUNT ));
}
}
Change-Id: I197b97aa6f131930627bbef0438950c9679fd58f
Seungho, Baek [Tue, 10 Sep 2019 00:36:28 +0000 (09:36 +0900)]
Force order, Premultiply alpha after alpha mask.
- Force to premultiply alpha after apply alpha mask if there is alpha mask.
Change-Id: I25c8c6a20dcbd39656d195abbff6ca6b4d18a008
Signed-off-by: Seungho, Baek <sbsh.baek@samsung.com>
Heeyong Song [Thu, 31 Oct 2019 01:02:02 +0000 (10:02 +0900)]
Fix premultiplied alpha issue
Premultiplied alpha value was wrong when using the cached texture
Change-Id: I0040278b084e060bc2269611877bd703491bee57
Heeyong Song [Mon, 21 Oct 2019 08:41:14 +0000 (17:41 +0900)]
(Vector) Ensure to release VectorRenderer in the main thread
Change-Id: Ie7a6798f92a55124a14b04df622b62549347ecfa