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

Make Toolbar menu measure and render UTF8 text. reviewed and approved by saari

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@12884 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ftang%netscape.com
1998-10-15 13:55:28 +00:00
parent f80cc2f932
commit 5500648646
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/cmd/macfe/gui/CRDFToolbarItem.cp
View File

@@ -240,8 +240,8 @@ CRDFPushButton :: CalcTitleFrame ( )
::GetFontInfo(&theInfo);
mCachedTitleFrame.top = mCachedButtonFrame.top;
mCachedTitleFrame.left = mCachedButtonFrame.left;
mCachedTitleFrame.right = mCachedTitleFrame.left + ::StringWidth(LStr255(title));;
mCachedTitleFrame.bottom = mCachedTitleFrame.top + theInfo.ascent + theInfo.descent + theInfo.leading;;
mCachedTitleFrame.right = mCachedTitleFrame.left + UGraphicGizmos::GetUTF8TextWidth(title, strlen(title));
mCachedTitleFrame.bottom = mCachedTitleFrame.top + theInfo.ascent + theInfo.descent + theInfo.leading;
if (mCurrentMode != eTOOLBAR_TEXT)
{
@@ -405,7 +405,7 @@ CRDFPushButton::GetPlacement( placement& outPlacement, SDimension16 space_availa
// minChars = atoi(minChars);
if ( minChars < itemText.length() )
itemText[minChars] = '\0';
UInt16 textWidth = ::StringWidth(LStr255(itemText.c_str()));
UInt16 textWidth = UGraphicGizmos::GetUTF8TextWidth(itemText.c_str(), itemText.length()) ;
outPlacement.max_horizontal_shrink = outPlacement.natural_size.width -
(graphicWidth + textWidth + kBullshitSpacingConstant);
@@ -569,7 +569,7 @@ CRDFPushButton :: DrawButtonTitle ( )
}
char* title = HT_GetNodeName(HTNode());
UGraphicGizmos::PlaceStringInRect(LStr255(title), mCachedTitleFrame, teCenter, teCenter);
UGraphicGizmos::PlaceUTF8TextInRect(title, strlen(title), mCachedTitleFrame, teCenter, teCenter);
} // DrawButtonTitle