diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2015-12-29 20:20:40 +0200 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2015-12-29 20:20:40 +0200 |
| commit | c73d9e5c444c7a263cc3507b371b21d0219bad83 (patch) | |
| tree | a8f3b94ba2a51a3eb9713d0f31827632f36c3fe8 /indra/llrender/llfontgl.h | |
| parent | 6901fea2033663e16f7fe7ad2afcf0ba4654eef8 (diff) | |
MAINT-5984 FIXED Incorrect cursor position with UI scale >1.0
Diffstat (limited to 'indra/llrender/llfontgl.h')
| -rwxr-xr-x | indra/llrender/llfontgl.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/llrender/llfontgl.h b/indra/llrender/llfontgl.h index 0988e99deb..7d0e53f60f 100755 --- a/indra/llrender/llfontgl.h +++ b/indra/llrender/llfontgl.h @@ -99,6 +99,15 @@ public: BOOL use_ellipses = FALSE) const; S32 render(const LLWString &text, S32 begin_offset, + const LLRectf& rect, + const LLColor4 &color, + HAlign halign = LEFT, VAlign valign = BASELINE, + U8 style = NORMAL, ShadowType shadow = NO_SHADOW, + S32 max_chars = S32_MAX, + F32* right_x=NULL, + BOOL use_ellipses = FALSE) const; + + S32 render(const LLWString &text, S32 begin_offset, F32 x, F32 y, const LLColor4 &color, HAlign halign = LEFT, VAlign valign = BASELINE, |