Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 11:55:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added GetAveCharWidth() function

Browse Source
This commit is contained in:
troy%netscape.com 2000-03-29 01:26:08 +00:00
parent 8dc180f736
commit 4e2ec77d3b
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gfx/public/nsIFontMetrics.h
View File

@ -154,6 +154,13 @@ public:
* Returns the font handle associated with these metrics
*/
NS_IMETHOD GetFontHandle(nsFontHandle &aHandle) = 0;
#ifdef _WIN32
/**
* Returns the average character width
*/
NS_IMETHOD GetAveCharWidth(nscoord& aAveCharWidth) = 0;
#endif
};
#endif /* nsIFontMetrics_h___ */

9
gfx/src/windows/nsFontMetricsWin.cpp
View File

@ -2524,6 +2524,7 @@ HDC dc1 = NULL;
mMaxAscent = NSToCoordRound(metrics.tmAscent * dev2app);
mMaxDescent = NSToCoordRound(metrics.tmDescent * dev2app);
mMaxAdvance = NSToCoordRound(metrics.tmMaxCharWidth * dev2app);
mAveCharWidth = NSToCoordRound(metrics.tmAveCharWidth * dev2app);
// Cache the width of a single space.
SIZE size;
@ -2647,6 +2648,13 @@ nsFontMetricsWin::GetFontHandle(nsFontHandle &aHandle)
return NS_OK;
}
NS_IMETHODIMP
nsFontMetricsWin::GetAveCharWidth(nscoord &aAveCharWidth)
{
aAveCharWidth = mAveCharWidth;
return NS_OK;
}
nsFontWin::nsFontWin(LOGFONT* aLogFont, HFONT aFont, PRUint32* aMap)
{
if (aLogFont) {
@ -2678,7 +2686,6 @@ nsFontWinUnicode::GetWidth(HDC aDC, const PRUnichar* aString, PRUint32 aLength)
{
SIZE size;
::GetTextExtentPoint32W(aDC, aString, aLength, &size);
return size.cx;
}

2
gfx/src/windows/nsFontMetricsWin.h
View File

@ -123,6 +123,7 @@ public:
NS_IMETHOD GetFont(const nsFont *&aFont);
NS_IMETHOD GetLangGroup(nsIAtom** aLangGroup);
NS_IMETHOD GetFontHandle(nsFontHandle &aHandle);
NS_IMETHOD GetAveCharWidth(nscoord &aAveCharWidth);
virtual nsresult GetSpaceWidth(nscoord &aSpaceWidth);
virtual nsFontWin* FindGlobalFont(HDC aDC, PRUnichar aChar);
@ -199,6 +200,7 @@ protected:
nscoord mMaxAscent;
nscoord mMaxDescent;
nscoord mMaxAdvance;
nscoord mAveCharWidth;
#ifdef MOZ_MATHML
float mItalicSlope;
#endif