X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Ftext-io.cpp;h=279e1aa22f3347355313b4aaffb6a6c09af26c4e;hp=3bc1761fe4e24d5b5dd6374ebe27bc228f774892;hb=528aa3699cd51dab5115bca1aaebb65d4bc67c15;hpb=d04c5bdbb95cc98f90848c7a98b0b2804df6e5b8 diff --git a/dali-toolkit/internal/text/text-io.cpp b/dali-toolkit/internal/text/text-io.cpp index 3bc1761..279e1aa 100644 --- a/dali-toolkit/internal/text/text-io.cpp +++ b/dali-toolkit/internal/text/text-io.cpp @@ -20,8 +20,8 @@ // EXTERNAL INCLUDES #include -#include -#include +#include +#include namespace Dali { @@ -77,7 +77,7 @@ std::ostream& operator<< (std::ostream& o, const Vector& fontRun) FontId id = fontRun[i].fontId; TextAbstraction::FontDescription fontDescription; fontClient.GetDescription( id, fontDescription ); - o << "ID:" << id << ", " << fontDescription.family << " style:" << fontDescription.style << " size:" << (fontClient.GetPointSize(id) / 64); + o << "ID:" << id << ", " << fontDescription.family << " width: " << fontDescription.width << " weight: " << fontDescription.weight << " slant: " << fontDescription.slant << " size:" << (fontClient.GetPointSize(id) / 64); if( i+1 < fontRun.Count() ) { @@ -93,7 +93,7 @@ std::ostream& operator<< (std::ostream& o, const Vector& lineRuns) for( unsigned int i=0; i9 Characters: 0->9 (10)" for a ten character run staring from beginning of the model - o << "Line " << i << " Glyphs: " << lineRuns[i].glyphIndex << "->" << (lineRuns[i].glyphIndex + lineRuns[i].numberOfGlyphs ); + o << "Line " << i << " Glyphs: " << lineRuns[i].glyphRun.glyphIndex << "->" << (lineRuns[i].glyphRun.glyphIndex + lineRuns[i].glyphRun.numberOfGlyphs ); o << " Characters: " << lineRuns[i].characterRun.characterIndex << "->" << (lineRuns[i].characterRun.characterIndex + lineRuns[i].characterRun.numberOfCharacters ); o << " Width: " << lineRuns[i].width; o << " Ascender: " << lineRuns[i].ascender;