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
Adding Selection Markers to TextField
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
text-io.cpp
diff --git
a/dali-toolkit/internal/text/text-io.cpp
b/dali-toolkit/internal/text/text-io.cpp
index
3a0fe9b
..
99f8a8c
100644
(file)
--- a/
dali-toolkit/internal/text/text-io.cpp
+++ b/
dali-toolkit/internal/text/text-io.cpp
@@
-20,8
+20,8
@@
// EXTERNAL INCLUDES
#include <iostream>
// EXTERNAL INCLUDES
#include <iostream>
-#include <dali/
public
-api/text-abstraction/font-client.h>
-#include <dali/
public
-api/text-abstraction/script.h>
+#include <dali/
devel
-api/text-abstraction/font-client.h>
+#include <dali/
devel
-api/text-abstraction/script.h>
namespace Dali
{
namespace Dali
{
@@
-93,9
+93,11
@@
std::ostream& operator<< (std::ostream& o, const Vector<LineRun>& lineRuns)
for( unsigned int i=0; i<lineRuns.Count(); ++i )
{
// e.g. Print "Line 0 Glyphs: 0->9 Characters: 0->9 (10)" for a ten character run staring from beginning of the model
for( unsigned int i=0; i<lineRuns.Count(); ++i )
{
// e.g. Print "Line 0 Glyphs: 0->9 Characters: 0->9 (10)" for a ten character run staring from beginning of the model
- o << "Line " << i << " Glyphs: " << lineRuns[i].glyph
Index << "->" << (lineRuns[i].glyphIndex + lineRuns[i]
.numberOfGlyphs );
+ o << "Line " << i << " Glyphs: " << lineRuns[i].glyph
Run.glyphIndex << "->" << (lineRuns[i].glyphRun.glyphIndex + lineRuns[i].glyphRun
.numberOfGlyphs );
o << " Characters: " << lineRuns[i].characterRun.characterIndex << "->" << (lineRuns[i].characterRun.characterIndex + lineRuns[i].characterRun.numberOfCharacters );
o << " Characters: " << lineRuns[i].characterRun.characterIndex << "->" << (lineRuns[i].characterRun.characterIndex + lineRuns[i].characterRun.numberOfCharacters );
- o << " Size: " << lineRuns[i].lineSize;
+ o << " Width: " << lineRuns[i].width;
+ o << " Ascender: " << lineRuns[i].ascender;
+ o << " Descender: " << lineRuns[i].descender;
if( i+1 < lineRuns.Count() )
{
if( i+1 < lineRuns.Count() )
{