mozilla
/
mozilla-history
зеркало из https://github.com/mozilla/mozilla-history.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

improved documentation. made font handling more robust in the case of 

unspecified font.
This commit is contained in:
michaelp%netscape.com 1998-10-02 18:19:30 +00:00
Родитель 9104dfde1c
Коммит f670f192a8
2 изменённых файлов: 79 добавлений и 28 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

29
gfx/src/nsIRenderingContext.h
Просмотреть файл

@ -204,7 +204,8 @@ public:
virtual void SetFont(nsIFontMetrics *aFontMetrics) = 0;
/**
* Get the current font for the RenderingContext
* Get the current font for the RenderingContext.
* If no font has been Set, the results are undefined.
* @return The current font of the RenderingContext
*/
virtual const nsFont& GetFont() = 0;
@ -379,32 +380,58 @@ public:
/**
* Returns the width (in app units) of an 8-bit character
* If no font has been Set, the results are undefined.
* @param aC character to measure
* @param aWidth out parameter for width
* @return error status
*/
NS_IMETHOD GetWidth(char aC, nscoord &aWidth) = 0;
/**
* Returns the width (in app units) of a unicode character
* If no font has been Set, the results are undefined.
* @param aC character to measure
* @param aWidth out parameter for width
* @return error status
*/
NS_IMETHOD GetWidth(PRUnichar aC, nscoord &aWidth) = 0;
/**
* Returns the width (in app units) of an nsString
* If no font has been Set, the results are undefined.
* @param aString string to measure
* @param aWidth out parameter for width
* @return error status
*/
NS_IMETHOD GetWidth(const nsString& aString, nscoord &aWidth) = 0;
/**
* Returns the width (in app units) of an 8-bit character string
* If no font has been Set, the results are undefined.
* @param aString string to measure
* @param aWidth out parameter for width
* @return error status
*/
NS_IMETHOD GetWidth(const char* aString, nscoord& aWidth) = 0;
/**
* Returns the width (in app units) of an 8-bit character string
* If no font has been Set, the results are undefined.
* @param aString string to measure
* @param aLength number of characters in string
* @param aWidth out parameter for width
* @return error status
*/
NS_IMETHOD GetWidth(const char* aString, PRUint32 aLength,
nscoord& aWidth) = 0;
/**
* Returns the width (in app units) of a Unicode character string
* If no font has been Set, the results are undefined.
* @param aString string to measure
* @param aLength number of characters in string
* @param aWidth out parameter for width
* @return error status
*/
NS_IMETHOD GetWidth(const PRUnichar *aString, PRUint32 aLength,
nscoord &aWidth) = 0;

78
gfx/src/windows/nsRenderingContextWin.cpp
Просмотреть файл

@ -870,7 +870,10 @@ void nsRenderingContextWin :: SetFont(nsIFontMetrics *aFontMetrics)
const nsFont& nsRenderingContextWin :: GetFont()
{
const nsFont* font;
mFontMetrics->GetFont(font);
if (nsnull != mFontMetrics)
mFontMetrics->GetFont(font);
return *font;
}
@ -1288,13 +1291,18 @@ nsRenderingContextWin :: GetWidth(const char* aString,
PRUint32 aLength,
nscoord& aWidth)
{
SIZE size;
if (nsnull != mFontMetrics)
{
SIZE size;
SetupFontAndColor();
::GetTextExtentPoint32(mDC, aString, aLength, &size);
aWidth = NSToCoordRound(float(size.cx) * mP2T);
SetupFontAndColor();
::GetTextExtentPoint32(mDC, aString, aLength, &size);
aWidth = NSToCoordRound(float(size.cx) * mP2T);
return NS_OK;
return NS_OK;
}
else
return NS_ERROR_FAILURE;
}
NS_IMETHODIMP
@ -1308,13 +1316,18 @@ nsRenderingContextWin :: GetWidth(const PRUnichar *aString,
PRUint32 aLength,
nscoord &aWidth)
{
SIZE size;
if (nsnull != mFontMetrics)
{
SIZE size;
SetupFontAndColor();
::GetTextExtentPoint32W(mDC, aString, aLength, &size);
aWidth = NSToCoordRound(float(size.cx) * mP2T);
SetupFontAndColor();
::GetTextExtentPoint32W(mDC, aString, aLength, &size);
aWidth = NSToCoordRound(float(size.cx) * mP2T);
return NS_OK;
return NS_OK;
}
else
return NS_ERROR_FAILURE;
}
void nsRenderingContextWin :: DrawString(const char *aString, PRUint32 aLength,
@ -1328,31 +1341,41 @@ void nsRenderingContextWin :: DrawString(const char *aString, PRUint32 aLength,
mTMatrix->TransformCoord(&x,&y);
::ExtTextOut(mDC,x,y,0,NULL,aString,aLength,NULL);
PRUint8 decorations = GetFont().decorations;
if (decorations & NS_FONT_DECORATION_OVERLINE) {
nscoord offset;
nscoord size;
mFontMetrics->GetUnderline(offset, size);
FillRect(aX, aY, aWidth, size);
if (nsnull != mFontMetrics)
{
PRUint8 decorations = GetFont().decorations;
if (decorations & NS_FONT_DECORATION_OVERLINE)
{
nscoord offset;
nscoord size;
mFontMetrics->GetUnderline(offset, size);
FillRect(aX, aY, aWidth, size);
}
}
}
void nsRenderingContextWin :: DrawString(const PRUnichar *aString, PRUint32 aLength,
nscoord aX, nscoord aY, nscoord aWidth)
{
int x = aX;
int x = aX;
int y = aY;
SetupFontAndColor();
mTMatrix->TransformCoord(&x,&y);
::ExtTextOutW(mDC,x,y,0,NULL,aString,aLength,NULL);
PRUint8 decorations = GetFont().decorations;
if (decorations & NS_FONT_DECORATION_OVERLINE) {
nscoord offset;
nscoord size;
mFontMetrics->GetUnderline(offset, size);
FillRect(aX, aY, aWidth, size);
if (nsnull != mFontMetrics)
{
PRUint8 decorations = GetFont().decorations;
if (decorations & NS_FONT_DECORATION_OVERLINE)
{
nscoord offset;
nscoord size;
mFontMetrics->GetUnderline(offset, size);
FillRect(aX, aY, aWidth, size);
}
}
}
@ -1487,7 +1510,8 @@ HBRUSH nsRenderingContextWin :: SetupSolidBrush(void)
void nsRenderingContextWin :: SetupFontAndColor(void)
{
if ((mFontMetrics != mCurrFontMetrics) || (NULL == mCurrFontMetrics))
if (((mFontMetrics != mCurrFontMetrics) || (NULL == mCurrFontMetrics)) &&
(nsnull != mFontMetrics))
{
nsFontHandle fontHandle;
mFontMetrics->GetFontHandle(fontHandle);
@ -1500,7 +1524,8 @@ void nsRenderingContextWin :: SetupFontAndColor(void)
//printf("fonts: %d\n", ++numfont);
}
if (mCurrentColor != mCurrTextColor) {
if (mCurrentColor != mCurrTextColor)
{
::SetTextColor(mDC, PALETTERGB_COLORREF(mColor));
mStates->mTextColor = mCurrTextColor = mCurrentColor;
}
@ -1531,7 +1556,6 @@ HPEN nsRenderingContextWin :: SetupPen()
default:
pen = SetupSolidPen();
break;
}
return pen;