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.4.19] Merge branch 'devel/master'
[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
27932b2
..
83a518b
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
8
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
9
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.
@@
-203,7
+203,7
@@
const Vector4& ViewModel::GetOutlineColor() const
return mModel->GetOutlineColor();
}
return mModel->GetOutlineColor();
}
-
floa
t ViewModel::GetOutlineWidth() const
+
uint16_
t ViewModel::GetOutlineWidth() const
{
return mModel->GetOutlineWidth();
}
{
return mModel->GetOutlineWidth();
}
@@
-297,7
+297,7
@@
void ViewModel::ElideGlyphs()
// Need to reshape the glyph as the font may be different in size.
const GlyphInfo& ellipsisGlyph = fontClient.GetEllipsisGlyph( fontClient.GetPointSize( glyphToRemove.fontId ) );
// Need to reshape the glyph as the font may be different in size.
const GlyphInfo& ellipsisGlyph = fontClient.GetEllipsisGlyph( fontClient.GetPointSize( glyphToRemove.fontId ) );
- if( !firstPenSet )
+ if( !firstPenSet
|| glyphToRemove.advance == 0.f
)
{
const Vector2& position = *( elidedPositionsBuffer + index );
{
const Vector2& position = *( elidedPositionsBuffer + index );
@@
-332,7
+332,6
@@
void ViewModel::ElideGlyphs()
glyphInfo = ellipsisGlyph;
// Change the 'x' and 'y' position of the ellipsis glyph.
glyphInfo = ellipsisGlyph;
// Change the 'x' and 'y' position of the ellipsis glyph.
-
if( position.x > firstPenX )
{
position.x = firstPenX + removedGlypsWidth - ellipsisGlyphWidth;
if( position.x > firstPenX )
{
position.x = firstPenX + removedGlypsWidth - ellipsisGlyphWidth;
@@
-349,11
+348,6
@@
void ViewModel::ElideGlyphs()
{
if( index > 0u )
{
{
if( index > 0u )
{
- // If the index decreases to the previous line, firstPenX must be recalculated.
- if( numberOfLaidOutGlyphs - index == lastLine.glyphRun.numberOfGlyphs)
- {
- firstPenSet = false;
- }
--index;
}
else
--index;
}
else