From: Paul Wisbey <p.wisbey@samsung.com>
Date: Thu, 9 Apr 2015 16:52:25 +0000 (-0700)
Subject: Merge "Revert "Added UNDERLINE_HEIGHT property to TextLabel to override adaptor metri... 
X-Git-Tag: dali_1.0.38~11^2
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=c25b3c40178dadf12dc5e8f77c17413df0a55099;hp=-c

Merge "Revert "Added UNDERLINE_HEIGHT property to TextLabel to override adaptor metrics and rounded up font metrics to simulate EFL behavior"" into new_text
---

c25b3c40178dadf12dc5e8f77c17413df0a55099
diff --combined dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
index 419d1c4,73f40e9..60ca46e
--- a/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-label-impl.cpp
@@@ -88,7 -88,6 +88,6 @@@ DALI_PROPERTY_REGISTRATION( TextLabel, 
  DALI_PROPERTY_REGISTRATION( TextLabel, "shadow-color",         VECTOR4, SHADOW_COLOR         )
  DALI_PROPERTY_REGISTRATION( TextLabel, "underline-enabled",    BOOLEAN, UNDERLINE_ENABLED    )
  DALI_PROPERTY_REGISTRATION( TextLabel, "underline-color",      VECTOR4, UNDERLINE_COLOR      )
- DALI_PROPERTY_REGISTRATION( TextLabel, "underline-height",     FLOAT,   UNDERLINE_HEIGHT       )
  DALI_TYPE_REGISTRATION_END()
  
  } // namespace
@@@ -172,7 -171,7 +171,7 @@@ void TextLabel::SetProperty( BaseObject
          {
            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();
@@@ -290,20 -289,6 +289,6 @@@
          }
          break;
        }
- 
-       case Toolkit::TextLabel::Property::UNDERLINE_HEIGHT:
-       {
-         if( impl.mController )
-         {
-           float height = value.Get< float >();
-           if ( impl.mController->GetUnderlineHeight() != height )
-           {
-             impl.mController->SetUnderlineHeight( height );
-             impl.RequestTextRelayout();
-           }
-         }
-         break;
-       }
      }
    }
  }
@@@ -402,14 -387,6 +387,6 @@@ Property::Value TextLabel::GetProperty
          }
          break;
        }
-       case Toolkit::TextLabel::Property::UNDERLINE_HEIGHT:
-       {
-         if ( impl.mController )
-         {
-           value = impl.mController->GetUnderlineHeight();
-         }
-         break;
-       }
      }
    }
  
diff --combined dali-toolkit/internal/text/text-controller.cpp
index 626f451,7d05f52..2a3631f
--- a/dali-toolkit/internal/text/text-controller.cpp
+++ b/dali-toolkit/internal/text/text-controller.cpp
@@@ -58,8 -58,6 +58,8 @@@ struct ModifyEven
    std::string text;
  };
  
 +const std::string EMPTY_STRING("");
 +
  } // namespace
  
  namespace Dali
@@@ -650,8 -648,8 +650,8 @@@ struct Controller::TextInpu
        FontId defaultFontId = 0u;
        if( NULL == mFontDefaults )
        {
 -        defaultFontId = mFontClient.GetFontId( String::EMPTY,
 -                                               String::EMPTY );
 +        defaultFontId = mFontClient.GetFontId( EMPTY_STRING,
 +                                               EMPTY_STRING );
        }
        else
        {
@@@ -989,7 -987,6 +989,6 @@@ struct Controller::Imp
      mVisualModel->SetShadowOffset( Vector2::ZERO );
      mVisualModel->SetShadowColor( Vector4::ZERO );
      mVisualModel->SetUnderlineEnabled( false );
-     mVisualModel->SetUnderlineHeight( 0.0f );
    }
  
    ~Impl()
@@@ -1099,7 -1096,7 +1098,7 @@@ const std::string& Controller::GetDefau
      return mImpl->mFontDefaults->mDefaultFontFamily;
    }
  
 -  return String::EMPTY;;
 +  return EMPTY_STRING;
  }
  
  void Controller::SetDefaultFontStyle( const std::string& defaultFontStyle )
@@@ -1135,7 -1132,7 +1134,7 @@@ const std::string& Controller::GetDefau
      return mImpl->mFontDefaults->mDefaultFontStyle;
    }
  
 -  return String::EMPTY;
 +  return EMPTY_STRING;
  }
  
  void Controller::SetDefaultPointSize( float pointSize )
@@@ -1213,11 -1210,6 +1212,6 @@@ bool Controller::IsUnderlineEnabled() c
    return mImpl->mVisualModel->IsUnderlineEnabled();
  }
  
- float Controller::GetUnderlineHeight() const
- {
-   return mImpl->mVisualModel->GetUnderlineHeight();
- }
- 
  void Controller::SetTextColor( const Vector4& textColor )
  {
    mImpl->mVisualModel->SetTextColor( textColor );
@@@ -1243,11 -1235,6 +1237,6 @@@ void Controller::SetUnderlineEnabled( b
    mImpl->mVisualModel->SetUnderlineEnabled( enabled );
  }
  
- void Controller::SetUnderlineHeight( float height )
- {
-   mImpl->mVisualModel->SetUnderlineHeight( height );
- }
- 
  void Controller::EnableTextInput( DecoratorPtr decorator )
  {
    if( !mImpl->mTextInput )