Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better handling of UTF8.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@8454 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pinkerton%netscape.com
1998-08-25 20:23:47 +00:00
parent 9fe6bf1f51
commit 6ed01ceeef
2 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
mozilla/lib/mac/UserInterface/Tables/CStandardFlexTable.cp
View File

@@ -2450,12 +2450,13 @@ void CStandardFlexTable::SelectionChanged()
//----------------------------------------------------------------------------------------
void CStandardFlexTable::DrawTextString(
const char* inText,
const FontInfo* inFontInfo,
const TextDrawingStuff & inTextInfo,
SInt16 inMargin,
const Rect& inBounds,
SInt16 inJustification,
Boolean inDoTruncate,
TruncCode inTruncWhere)
// correctly handles UTF8 encoding
//----------------------------------------------------------------------------------------
{
Rect r = inBounds;
@@ -2463,14 +2464,25 @@ void CStandardFlexTable::DrawTextString(
r.left += inMargin;
r.right -= inMargin;
UGraphicGizmos::PlaceTextInRect(inText,
strlen(inText),
r,
inJustification,
teCenter,
inFontInfo,
inDoTruncate,
inTruncWhere );
if (inTextInfo.encoding == CStandardFlexTable::TextDrawingStuff::eDefault)
UGraphicGizmos::PlaceTextInRect(inText,
strlen(inText),
r,
inJustification,
teCenter,
&inTextInfo.mTextFontInfo,
inDoTruncate,
inTruncWhere );
else
UGraphicGizmos::PlaceUTF8TextInRect(inText,
strlen(inText),
r,
inJustification,
teCenter,
&inTextInfo.mTextFontInfo,
inDoTruncate,
inTruncWhere );
} // CStandardFlexTable::DrawTextString
//----------------------------------------------------------------------------------------

2
mozilla/lib/mac/UserInterface/Tables/CStandardFlexTable.h
View File

@@ -427,7 +427,7 @@ public:
const Rect& inBounds);
static void DrawTextString( const char* inText,
const FontInfo* inFontInfo,
const TextDrawingStuff & inTextInfo,
SInt16 inMargin,
const Rect& inBounds,
SInt16 inJustification = teFlushLeft,