projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[dali_1.2.61] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
text-controller.cpp
diff --git
a/dali-toolkit/internal/text/text-controller.cpp
b/dali-toolkit/internal/text/text-controller.cpp
index
4cc9d90
..
99e031a
100755
(executable)
--- a/
dali-toolkit/internal/text/text-controller.cpp
+++ b/
dali-toolkit/internal/text/text-controller.cpp
@@
-356,7
+356,7
@@
bool Controller::IsMultiLineEnabled() const
return Layout::Engine::MULTI_LINE_BOX == mImpl->mLayoutEngine.GetLayout();
}
return Layout::Engine::MULTI_LINE_BOX == mImpl->mLayoutEngine.GetLayout();
}
-void Controller::SetHorizontalAlignment(
Layout::HorizontalAlignment
alignment )
+void Controller::SetHorizontalAlignment(
Text::HorizontalAlignment::Type
alignment )
{
if( alignment != mImpl->mModel->mHorizontalAlignment )
{
{
if( alignment != mImpl->mModel->mHorizontalAlignment )
{
@@
-370,12
+370,12
@@
void Controller::SetHorizontalAlignment( Layout::HorizontalAlignment alignment )
}
}
}
}
-
Layout::HorizontalAlignment
Controller::GetHorizontalAlignment() const
+
Text::HorizontalAlignment::Type
Controller::GetHorizontalAlignment() const
{
return mImpl->mModel->mHorizontalAlignment;
}
{
return mImpl->mModel->mHorizontalAlignment;
}
-void Controller::SetVerticalAlignment(
Layout::VerticalAlignment
alignment )
+void Controller::SetVerticalAlignment(
VerticalAlignment::Type
alignment )
{
if( alignment != mImpl->mModel->mVerticalAlignment )
{
{
if( alignment != mImpl->mModel->mVerticalAlignment )
{
@@
-388,12
+388,12
@@
void Controller::SetVerticalAlignment( Layout::VerticalAlignment alignment )
}
}
}
}
-
Layout::VerticalAlignment
Controller::GetVerticalAlignment() const
+
VerticalAlignment::Type
Controller::GetVerticalAlignment() const
{
return mImpl->mModel->mVerticalAlignment;
}
{
return mImpl->mModel->mVerticalAlignment;
}
-void Controller::SetLineWrapMode(
Layou
t::LineWrap::Mode lineWrapMode )
+void Controller::SetLineWrapMode(
Tex
t::LineWrap::Mode lineWrapMode )
{
if( lineWrapMode != mImpl->mModel->mLineWrapMode )
{
{
if( lineWrapMode != mImpl->mModel->mLineWrapMode )
{
@@
-416,7
+416,7
@@
void Controller::SetLineWrapMode( Layout::LineWrap::Mode lineWrapMode )
}
}
}
}
-
Layou
t::LineWrap::Mode Controller::GetLineWrapMode() const
+
Tex
t::LineWrap::Mode Controller::GetLineWrapMode() const
{
return mImpl->mModel->mLineWrapMode;
}
{
return mImpl->mModel->mLineWrapMode;
}
@@
-1750,6
+1750,16
@@
void Controller::ShadowSetByString( bool setByString )
mImpl->mShadowSetByString = setByString;
}
mImpl->mShadowSetByString = setByString;
}
+bool Controller::IsOutlineSetByString()
+{
+ return mImpl->mOutlineSetByString;
+}
+
+void Controller::OutlineSetByString( bool setByString )
+{
+ mImpl->mOutlineSetByString = setByString;
+}
+
bool Controller::IsFontStyleSetByString()
{
return mImpl->mFontStyleSetByString;
bool Controller::IsFontStyleSetByString()
{
return mImpl->mFontStyleSetByString;
@@
-3450,17
+3460,17
@@
void Controller::CalculateVerticalOffset( const Size& controlSize )
switch( mImpl->mModel->mVerticalAlignment )
{
switch( mImpl->mModel->mVerticalAlignment )
{
- case
Layout::VERTICAL_ALIGN_
TOP:
+ case
VerticalAlignment::
TOP:
{
mImpl->mModel->mScrollPosition.y = 0.f;
break;
}
{
mImpl->mModel->mScrollPosition.y = 0.f;
break;
}
- case
Layout::VERTICAL_ALIGN_
CENTER:
+ case
VerticalAlignment::
CENTER:
{
mImpl->mModel->mScrollPosition.y = floorf( 0.5f * ( controlSize.height - layoutSize.height ) ); // try to avoid pixel alignment.
break;
}
{
mImpl->mModel->mScrollPosition.y = floorf( 0.5f * ( controlSize.height - layoutSize.height ) ); // try to avoid pixel alignment.
break;
}
- case
Layout::VERTICAL_ALIGN_
BOTTOM:
+ case
VerticalAlignment::
BOTTOM:
{
mImpl->mModel->mScrollPosition.y = controlSize.height - layoutSize.height;
break;
{
mImpl->mModel->mScrollPosition.y = controlSize.height - layoutSize.height;
break;