diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2012-06-06 23:21:07 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2012-06-06 23:21:07 -0400 |
| commit | 89ea7ccfc7fd4c33eab4ad9123141fa40231a00d (patch) | |
| tree | af2083dc9563abc8fa7a97100fc7766044d406e8 /indra/llrender/llfontgl.h | |
| parent | 3d1cb7ef111cbd5724262077702e0dc2a3d6998d (diff) | |
| parent | a519e34f02b4b2663fe082ba9ad12f1b423669cb (diff) | |
Automated merge with file:///Users/nat/linden/viewer-maint-1144
Diffstat (limited to 'indra/llrender/llfontgl.h')
| -rw-r--r-- | indra/llrender/llfontgl.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/indra/llrender/llfontgl.h b/indra/llrender/llfontgl.h index dc8d848ed2..74bdbb43e7 100644 --- a/indra/llrender/llfontgl.h +++ b/indra/llrender/llfontgl.h @@ -115,9 +115,7 @@ public: S32 renderUTF8(const std::string &text, S32 begin_offset, S32 x, S32 y, const LLColor4 &color, HAlign halign, VAlign valign, U8 style = NORMAL, ShadowType shadow = NO_SHADOW) const; // font metrics - override for LLFontFreetype that returns units of virtual pixels - F32 getLineHeight() const; - F32 getAscenderHeight() const; - F32 getDescenderHeight() const; + S32 getLineHeight() const; S32 getWidth(const std::string& utf8text) const; S32 getWidth(const llwchar* wchars) const; @@ -188,8 +186,9 @@ public: static std::string getFontPathLocal(); static std::string getFontPathSystem(); - static LLCoordFont sCurOrigin; - static std::vector<LLCoordFont> sOriginStack; + static LLCoordGL sCurOrigin; + static F32 sCurDepth; + static std::vector<std::pair<LLCoordGL, F32> > sOriginStack; static LLColor4 sShadowColor; |