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
Merge remote-tracking branch 'origin/tizen' into new_text
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
text
/
text-view.h
diff --git
a/dali-toolkit/public-api/text/text-view.h
b/dali-toolkit/public-api/text/text-view.h
index
81c63dd
..
432f5c5
100644
(file)
--- a/
dali-toolkit/public-api/text/text-view.h
+++ b/
dali-toolkit/public-api/text/text-view.h
@@
-65,15
+65,15
@@
public:
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetGlyphs()
*/
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetGlyphs()
*/
- virtual void GetGlyphs( GlyphIn
dex glyphIndex
,
- GlyphIn
fo* glyphs
,
+ virtual void GetGlyphs( GlyphIn
fo* glyphs
,
+ GlyphIn
dex glyphIndex
,
Length numberOfGlyphs ) const;
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetGlyphPositions()
*/
Length numberOfGlyphs ) const;
/**
* @copydoc Dali::Toolkit::Text::ViewInterface::GetGlyphPositions()
*/
- virtual void GetGlyphPositions(
GlyphIndex glyphIndex
,
-
Vector2* glyphPositions
,
+ virtual void GetGlyphPositions(
Vector2* glyphPositions
,
+
GlyphIndex glyphIndex
,
Length numberOfGlyphs ) const;
private:
Length numberOfGlyphs ) const;
private: