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

bug 8801; use same default size for all generics (serif, monospace, etc);

Browse Source 
set default size to 16px; allow pref to be specified in either px or pt;
as discussed in mozilla.layout; r=ftang
This commit is contained in:
erik%netscape.com 2000-01-15 16:30:13 +00:00
parent 068f20040e
commit 86706b24f4
2 changed files with 80 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
layout/base/nsPresContext.cpp
View File

@ -131,22 +131,51 @@ nsPresContext::GetFontPreferences()
}
if (mLangGroup) {
nsAutoString pref("font.size.");
pref.Append(mDefaultFont.name);
pref.Append('.');
const PRUnichar* langGroup = nsnull;
mLangGroup->GetUnicode(&langGroup);
pref.Append(langGroup);
char name[128];
pref.ToCString(name, sizeof(name));
PRInt32 size = 12;
mPrefs->GetIntPref(name, &size);
mDefaultFont.size = NSIntPointsToTwips(size);
pref.SetString("font.size.monospace.");
pref.Append(langGroup);
pref.ToCString(name, sizeof(name));
size = 10;
mPrefs->GetIntPref(name, &size);
mDefaultFixedFont.size = NSIntPointsToTwips(size);
mPrefs->CopyCharPref(name, &value);
char* defaultSize = "16px";
if (!value) {
value = defaultSize;
}
char* p = value;
PRInt32 size = 0;
while ((*p >= '0') && (*p <= '9')) {
size = ((size * 10) + (*p - '0'));
p++;
}
if (!size) {
while (*p) {
p++;
}
}
nscoord sz;
if (!PL_strcmp(p, "px")) {
float p2t;
GetScaledPixelsToTwips(&p2t);
sz = NSFloatPixelsToTwips((float) size, p2t);
mDefaultFont.size = sz;
mDefaultFixedFont.size = sz;
}
else if (!PL_strcmp(p, "pt")) {
sz = NSIntPointsToTwips(size);
mDefaultFont.size = sz;
mDefaultFixedFont.size = sz;
}
else {
float p2t;
GetScaledPixelsToTwips(&p2t);
sz = NSFloatPixelsToTwips(16.0, p2t);
mDefaultFont.size = sz;
mDefaultFixedFont.size = sz;
}
if (value != defaultSize) {
nsAllocator::Free(value);
value = nsnull;
}
}
}
}

51
layout/base/src/nsPresContext.cpp
View File

@ -131,22 +131,51 @@ nsPresContext::GetFontPreferences()
}
if (mLangGroup) {
nsAutoString pref("font.size.");
pref.Append(mDefaultFont.name);
pref.Append('.');
const PRUnichar* langGroup = nsnull;
mLangGroup->GetUnicode(&langGroup);
pref.Append(langGroup);
char name[128];
pref.ToCString(name, sizeof(name));
PRInt32 size = 12;
mPrefs->GetIntPref(name, &size);
mDefaultFont.size = NSIntPointsToTwips(size);
pref.SetString("font.size.monospace.");
pref.Append(langGroup);
pref.ToCString(name, sizeof(name));
size = 10;
mPrefs->GetIntPref(name, &size);
mDefaultFixedFont.size = NSIntPointsToTwips(size);
mPrefs->CopyCharPref(name, &value);
char* defaultSize = "16px";
if (!value) {
value = defaultSize;
}
char* p = value;
PRInt32 size = 0;
while ((*p >= '0') && (*p <= '9')) {
size = ((size * 10) + (*p - '0'));
p++;
}
if (!size) {
while (*p) {
p++;
}
}
nscoord sz;
if (!PL_strcmp(p, "px")) {
float p2t;
GetScaledPixelsToTwips(&p2t);
sz = NSFloatPixelsToTwips((float) size, p2t);
mDefaultFont.size = sz;
mDefaultFixedFont.size = sz;
}
else if (!PL_strcmp(p, "pt")) {
sz = NSIntPointsToTwips(size);
mDefaultFont.size = sz;
mDefaultFixedFont.size = sz;
}
else {
float p2t;
GetScaledPixelsToTwips(&p2t);
sz = NSFloatPixelsToTwips(16.0, p2t);
mDefaultFont.size = sz;
mDefaultFixedFont.size = sz;
}
if (value != defaultSize) {
nsAllocator::Free(value);
value = nsnull;
}
}
}
}