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
{
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();
}
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;
- }
}
}
}
}
break;
}
- case Toolkit::TextLabel::Property::UNDERLINE_HEIGHT:
- {
- if ( impl.mController )
- {
- value = impl.mController->GetUnderlineHeight();
- }
- break;
- }
}
}
std::string text;
};
+const std::string EMPTY_STRING("");
+
} // namespace
namespace Dali
FontId defaultFontId = 0u;
if( NULL == mFontDefaults )
{
- defaultFontId = mFontClient.GetFontId( String::EMPTY,
- String::EMPTY );
+ defaultFontId = mFontClient.GetFontId( EMPTY_STRING,
+ EMPTY_STRING );
}
else
{
mVisualModel->SetShadowOffset( Vector2::ZERO );
mVisualModel->SetShadowColor( Vector4::ZERO );
mVisualModel->SetUnderlineEnabled( false );
- mVisualModel->SetUnderlineHeight( 0.0f );
}
~Impl()
return mImpl->mFontDefaults->mDefaultFontFamily;
}
- return String::EMPTY;;
+ return EMPTY_STRING;
}
void Controller::SetDefaultFontStyle( const std::string& defaultFontStyle )
return mImpl->mFontDefaults->mDefaultFontStyle;
}
- return String::EMPTY;
+ return EMPTY_STRING;
}
void Controller::SetDefaultPointSize( float pointSize )
return mImpl->mVisualModel->IsUnderlineEnabled();
}
- float Controller::GetUnderlineHeight() const
- {
- return mImpl->mVisualModel->GetUnderlineHeight();
- }
-
void Controller::SetTextColor( const Vector4& textColor )
{
mImpl->mVisualModel->SetTextColor( textColor );
mImpl->mVisualModel->SetUnderlineEnabled( enabled );
}
- void Controller::SetUnderlineHeight( float height )
- {
- mImpl->mVisualModel->SetUnderlineHeight( height );
- }
-
void Controller::EnableTextInput( DecoratorPtr decorator )
{
if( !mImpl->mTextInput )