projects / test / tct / native / api.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 745706d)
[UTC/ITC][dali-toolkit][Non-ACR][fix the size of font base on dpi] 18/205318/2
authorSunghyun kim <scholb.kim@samsung.com>
Thu, 2 May 2019 08:14:16 +0000 (17:14 +0900)
committersunghyun kim <scholb.kim@samsung.com>
Fri, 3 May 2019 01:15:29 +0000 (01:15 +0000)
Change-Id: Iccd9ae9773d011812fd9c12fc33a778b5b731d55

src/itc/dali-toolkit/text-editor/ITs-text-editor.cpp patch | blob | history
src/utc/dali-toolkit/text-editor/utc-dali-text-editor.cpp patch | blob | history

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 1097e9621ef8b91cbba73977c2e59661fee176c3..b12e799684e2db67440c0cad27e86363ad664062 100755 (executable)
--- 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<float>( 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<float>( 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 31d8b20df6c5e11b7f4d51cb0e034c48c30b07bb..18543c3b9a7ddca681aac5b263d4ab6accc9d96e 100755 (executable)
--- 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 );
Domain: Testing;