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
Revert "Fixed an incorrect ellipsis"
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
rendering
/
view-model.cpp
diff --git
a/dali-toolkit/internal/text/rendering/view-model.cpp
b/dali-toolkit/internal/text/rendering/view-model.cpp
index
fe3c451
..
3543fce
100755
(executable)
--- a/
dali-toolkit/internal/text/rendering/view-model.cpp
+++ b/
dali-toolkit/internal/text/rendering/view-model.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
7
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
8
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-61,16
+61,21
@@
const Vector2& ViewModel::GetScrollPosition() const
return mModel->GetScrollPosition();
}
return mModel->GetScrollPosition();
}
-
Layout::HorizontalAlignment
ViewModel::GetHorizontalAlignment() const
+
HorizontalAlignment::Type
ViewModel::GetHorizontalAlignment() const
{
return mModel->GetHorizontalAlignment();
}
{
return mModel->GetHorizontalAlignment();
}
-
Layout::VerticalAlignment
ViewModel::GetVerticalAlignment() const
+
VerticalAlignment::Type
ViewModel::GetVerticalAlignment() const
{
return mModel->GetVerticalAlignment();
}
{
return mModel->GetVerticalAlignment();
}
+DevelText::VerticalLineAlignment::Type ViewModel::GetVerticalLineAlignment() const
+{
+ return mModel->GetVerticalLineAlignment();
+}
+
bool ViewModel::IsTextElideEnabled() const
{
return mModel->IsTextElideEnabled();
bool ViewModel::IsTextElideEnabled() const
{
return mModel->IsTextElideEnabled();
@@
-163,6
+168,11
@@
const Vector4& ViewModel::GetShadowColor() const
return mModel->GetShadowColor();
}
return mModel->GetShadowColor();
}
+const float& ViewModel::GetShadowBlurRadius() const
+{
+ return mModel->GetShadowBlurRadius();
+}
+
const Vector4& ViewModel::GetUnderlineColor() const
{
return mModel->GetUnderlineColor();
const Vector4& ViewModel::GetUnderlineColor() const
{
return mModel->GetUnderlineColor();
@@
-198,6
+208,16
@@
float ViewModel::GetOutlineWidth() const
return mModel->GetOutlineWidth();
}
return mModel->GetOutlineWidth();
}
+const Vector4& ViewModel::GetBackgroundColor() const
+{
+ return mModel->GetBackgroundColor();
+}
+
+bool ViewModel::IsBackgroundEnabled() const
+{
+ return mModel->IsBackgroundEnabled();
+}
+
void ViewModel::ElideGlyphs()
{
mIsTextElided = false;
void ViewModel::ElideGlyphs()
{
mIsTextElided = false;