diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-01-07 16:20:27 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-01-07 16:20:27 -0500 |
| commit | 6abd41831a4cae5d757aa44675731d1fd48d64b1 (patch) | |
| tree | 6fc9de74e865a8337823b317a87b7c132bca0c7a /indra/llrender/llfontgl.h | |
| parent | bb04795eeb222e5396e24e79ac1f77b155bd4622 (diff) | |
| parent | 6b8ed2ae6f92d6f9559cbc86699b9ca3197f2e81 (diff) | |
automated merge viewer2.0->viewer2.0
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). |