X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftext-controls%2Ftext-label-impl.cpp;h=0cfec0514ba6ce6cc28d2e022dff089996458be1;hp=73f40e9c3613e248047d5efc6ddd54bc60bdbdcf;hb=fc72d9dfdefd7434202ed73ac579d425279947f3;hpb=9aa36e970b71cdfa780945e484e216aac1443493

diff --git a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
index 73f40e9..0cfec05 100644
--- a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
@@ -171,7 +171,7 @@ void TextLabel::SetProperty( BaseObject* object, Property::Index index, const Pr
         {
           float pointSize = value.Get< float >();
 
-          if( impl.mController->GetDefaultPointSize() != pointSize /*TODO - epsilon*/ )
+          if( fabsf(impl.mController->GetDefaultPointSize() - pointSize) > Math::MACHINE_EPSILON_1 )
           {
             impl.mController->SetDefaultPointSize( pointSize );
             impl.RequestTextRelayout();
@@ -400,8 +400,8 @@ void TextLabel::OnInitialize()
   mController = Text::Controller::New( *this );
 
   // Use height-for-width negotiation by default
-  self.SetResizePolicy( FILL_TO_PARENT, WIDTH );
-  self.SetResizePolicy( DIMENSION_DEPENDENCY, HEIGHT );
+  self.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
+  self.SetResizePolicy( ResizePolicy::DIMENSION_DEPENDENCY, Dimension::HEIGHT );
 }
 
 void TextLabel::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange change )