X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftext-controls%2Ftext-label-impl.cpp;h=be24d2bf8cbe47077593beb2efdbc449023f2edc;hb=6861f629112d44d4de1a8a7c70591e2279b951b2;hp=f946cf25b7ea8965335332df295178ed99464013;hpb=5c07fde9dd6a022e2080c871994499e56eff89aa;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

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 f946cf2..be24d2b 100644
--- a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
@@ -147,10 +147,8 @@ void TextLabel::SetProperty( BaseObject* object, Property::Index index, const Pr
         {
           const std::string fontFamily = value.Get< std::string >();
 
-          if( impl.mController->GetDefaultFontFamily() != fontFamily )
-          {
-            impl.mController->SetDefaultFontFamily( fontFamily, true );
-          }
+          DALI_LOG_INFO( gLogFilter, Debug::General, "TextLabel::SetProperty Property::FONT_FAMILY newFont(%s)\n", fontFamily.c_str() );
+          impl.mController->SetDefaultFontFamily( fontFamily );
         }
         break;
       }
@@ -444,7 +442,10 @@ void TextLabel::OnInitialize()
 
   // Enable the text ellipsis.
   LayoutEngine& engine = mController->GetLayoutEngine();
+
   engine.SetTextEllipsisEnabled( true );
+  engine.SetCursorWidth( 0u ); // Do not layout space for the cursor.
+
   self.OnStageSignal().Connect( this, &TextLabel::OnStageConnect );
 }
 
@@ -457,9 +458,9 @@ void TextLabel::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::
   {
     case StyleChange::DEFAULT_FONT_CHANGE:
     {
-      DALI_LOG_INFO( gLogFilter, Debug::General, "TextLabel::OnStyleChange StyleChange::DEFAULT_FONT_CHANGE\n");
       // Property system did not set the font so should update it.
       std::string newFont = styleManager.GetDefaultFontFamily();
+      DALI_LOG_INFO( gLogFilter, Debug::General, "TextLabel::OnStyleChange StyleChange::DEFAULT_FONT_CHANGE newFont(%s)\n", newFont.c_str() );
       mController->UpdateAfterFontChange( newFont );
       break;
     }