From: Sunghyun kim Date: Thu, 2 May 2019 08:14:16 +0000 (+0900) Subject: [UTC/ITC][dali-toolkit][Non-ACR][fix the size of font base on dpi] X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=67df370320f2337887c594daf434cf4bb5fd37c1;p=test%2Ftct%2Fnative%2Fapi.git [UTC/ITC][dali-toolkit][Non-ACR][fix the size of font base on dpi] Change-Id: Iccd9ae9773d011812fd9c12fc33a778b5b731d55 --- diff --git a/src/itc/dali-toolkit/text-editor/ITs-text-editor.cpp b/src/itc/dali-toolkit/text-editor/ITs-text-editor.cpp index 1097e9621..b12e79968 100755 --- a/src/itc/dali-toolkit/text-editor/ITs-text-editor.cpp +++ b/src/itc/dali-toolkit/text-editor/ITs-text-editor.cpp @@ -465,8 +465,8 @@ void TextEditorScrollStateChangedSignal( ScrollStateChangeCallback& callback ) TextEditor editor = TextEditor::New(); Stage::GetCurrent().Add( editor ); - editor.SetProperty( TextEditor::Property::POINT_SIZE, 10.f ); - DALI_CHECK_FAIL( editor.GetProperty( TextEditor::Property::POINT_SIZE ) - 10.f > Math::MACHINE_EPSILON_1000, "Set/Get Property mismatch" ); + editor.SetProperty( TextEditor::Property::PIXEL_SIZE, 10.f ); + DALI_CHECK_FAIL( editor.GetProperty( TextEditor::Property::PIXEL_SIZE ) - 10.f > Math::MACHINE_EPSILON_1000, "Set/Get Property mismatch" ); editor.SetSize( 50.f, 50.f ); editor.SetParentOrigin( ParentOrigin::TOP_LEFT ); DALI_CHECK_FAIL( editor.GetCurrentParentOrigin() != ParentOrigin::TOP_LEFT, "ParentOrigin mismatch" ); diff --git a/src/utc/dali-toolkit/text-editor/utc-dali-text-editor.cpp b/src/utc/dali-toolkit/text-editor/utc-dali-text-editor.cpp index 31d8b20df..18543c3b9 100755 --- a/src/utc/dali-toolkit/text-editor/utc-dali-text-editor.cpp +++ b/src/utc/dali-toolkit/text-editor/utc-dali-text-editor.cpp @@ -420,7 +420,7 @@ void TextEditorScrollStateChangedSignal( ScrollStateChangeCallback& callback ) TextEditor editor = TextEditor::New(); Stage::GetCurrent().Add( editor ); - editor.SetProperty( TextEditor::Property::POINT_SIZE, 10.f ); + editor.SetProperty( TextEditor::Property::PIXEL_SIZE, 10.f ); editor.SetSize( 50.f, 50.f ); editor.SetParentOrigin( ParentOrigin::TOP_LEFT ); editor.SetAnchorPoint( AnchorPoint::TOP_LEFT );