Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-24 13:52:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

css button and caption font is set to be two point sizes larger than the default GUI size.

Browse Source 
caption font shouldn't (and now doesn't) use the actual Windows platform specific "caption" font
b=33312 r=kmcclusk
This commit is contained in:
rods%netscape.com 2000-08-14 13:54:50 +00:00
parent 76f9c50305
commit 054af17366
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gfx/src/windows/nsDeviceContextWin.cpp
View File

@ -351,9 +351,10 @@ nsresult GetSysFontInfo(HDC aHDC, nsSystemAttrID anID, nsFont* aFont)
switch (anID)
{
case eSystemAttr_Font_Caption:
ptrLogFont = &ncm.lfCaptionFont;
break;
// Caption in CSS is NOT the same as Caption on Windows
//case eSystemAttr_Font_Caption:
// ptrLogFont = &ncm.lfCaptionFont;
// break;
case eSystemAttr_Font_Icon:
ptrLogFont = &logFont;
@ -388,6 +389,7 @@ nsresult GetSysFontInfo(HDC aHDC, nsSystemAttrID anID, nsFont* aFont)
case eSystemAttr_Font_PullDownMenu:
case eSystemAttr_Font_List:
case eSystemAttr_Font_Field:
case eSystemAttr_Font_Caption:
hGDI = ::GetStockObject(DEFAULT_GUI_FONT);
if (hGDI != NULL)
{
@ -433,6 +435,16 @@ nsresult GetSysFontInfo(HDC aHDC, nsSystemAttrID anID, nsFont* aFont)
// Do Size
int pointSize = -MulDiv(ptrLogFont->lfHeight, 72, ::GetDeviceCaps(aHDC, LOGPIXELSY));
//printf("\n\n Default Font size: %dpt\n", pointSize);
// As far as I can tell the Default size 8pt
// increase it by 2 points to match Windows GUI
if (anID == eSystemAttr_Font_Button ||
anID == eSystemAttr_Font_Field ||
anID == eSystemAttr_Font_List ||
anID == eSystemAttr_Font_Widget ||
anID == eSystemAttr_Font_Caption) {
pointSize += 2;
}
aFont->size = NSIntPointsToTwips(pointSize);
return NS_OK;