diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-11 12:57:42 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-01-11 12:57:42 +0200 |
| commit | 9393c28831c3b51d9b84950bb0bc89ca50edac23 (patch) | |
| tree | 46f3aeb3d340d115c6ccd4a53993350b47691f96 /indra/llrender/llfontgl.h | |
| parent | 1a21ce62c225dfc8f2671691929a3b1a9bc73726 (diff) | |
| parent | df08485cf840e21e2ec8d14664a45714e0a3ca96 (diff) | |
Merge from default branch.
--HG--
branch : product-engine
Diffstat (limited to 'indra/llrender/llfontgl.h')
| -rw-r--r-- | indra/llrender/llfontgl.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/llrender/llfontgl.h b/indra/llrender/llfontgl.h index ea8eee7690..dfa4cf8ce5 100644 --- a/indra/llrender/llfontgl.h +++ b/indra/llrender/llfontgl.h @@ -122,7 +122,13 @@ public: // The following are called often, frequently with large buffers, so do not use a string interface // Returns the max number of complete characters from text (up to max_chars) that can be drawn in max_pixels - S32 maxDrawableChars(const llwchar* wchars, F32 max_pixels, S32 max_chars = S32_MAX, BOOL end_on_word_boundary = FALSE) const; + typedef enum e_word_wrap_style + { + ONLY_WORD_BOUNDARIES, + WORD_BOUNDARY_IF_POSSIBLE, + ANYWHERE + } EWordWrapStyle ; + S32 maxDrawableChars(const llwchar* wchars, F32 max_pixels, S32 max_chars = S32_MAX, EWordWrapStyle end_on_word_boundary = ANYWHERE) const; // Returns the index of the first complete characters from text that can be drawn in max_pixels // given that the character at start_pos should be the last character (or as close to last as possible). |