Include update to TextField

This commit is contained in:
Joshua Granick
2015-01-28 10:49:05 -08:00
parent 482cf73341
commit 49b7d08622
6 changed files with 268 additions and 170 deletions

View File

@@ -36,10 +36,11 @@ struct TextLineMetrics
enum
enum TextFormatFlags
{
ffItalic = 0x01,
ffBold = 0x02,
ffItalic = 0x01,
ffBold = 0x02,
ffUnderline = 0x04,
};
@@ -120,13 +121,14 @@ struct CharGroup
bool UpdateFont(double inScale,bool inNative);
void UpdateMetrics(TextLineMetrics &ioMetrics);
double Height(double inFontToLocal);
int Chars() { return mString.size(); }
int Chars() const { return mString.size(); }
void ApplyFormat(TextFormat *inFormat);
int mChar0;
QuickVec<wchar_t,0> mString;
int mFontHeight;
unsigned int mFlags;
TextFormat *mFormat;
class Font *mFont;
};
@@ -215,4 +217,4 @@ class FontCache
} // end namespace nme
#endif
#endif

View File

@@ -185,13 +185,13 @@ private:
StringState mStringState;
WString mUserString;
void SplitGroup(int inGroup,int inPos);
void SplitGroup(int inGroup,int inPos);
void BuildBackground();
void BuildBackground();
int PointToChar(UserPoint inPoint) const;
int LineFromChar(int inChar);
int GroupFromChar(int inChar);
int LineFromChar(int inChar) const;
int GroupFromChar(int inChar) const;
double EndOfCharX(int inChar,int inLine) const;
double EndOfLineX(int inLine) const;
UserPoint GetScrollPos() const;
@@ -226,4 +226,4 @@ private:
} // end namespace nme
#endif
#endif