Added a _fontFallback to TextBase to cache any fallback font (usually DefaultFont) that is used when the Textbase::_font is null.

This commit is contained in:
Robert Osfield
2019-07-31 14:11:59 +01:00
parent 92abaca210
commit 149c04b0df
4 changed files with 6 additions and 7 deletions

View File

@@ -265,7 +265,6 @@ protected:
virtual osg::StateSet* createStateSet();
Font* getActiveFont();
const Font* getActiveFont() const;
String::iterator computeLastCharacterOnLine(osg::Vec2& cursor, String::iterator first,String::iterator last);

View File

@@ -312,6 +312,7 @@ protected:
// members which have public access.
osg::Vec4 _color;
osg::ref_ptr<Font> _font;
osg::ref_ptr<Font> _fontFallback;
osg::ref_ptr<Style> _style;
FontResolution _fontSize;
float _characterHeight;