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

bug 24355; Fixed Width Font too large in documents with text fields,

Browse Source 
e.g. Bugzilla; going back to the old Variable bigger than Fixed way;
r=ftang; a=chofmann
This commit is contained in:
erik%netscape.com 2000-01-20 01:20:11 +00:00
parent 7eb0c2a49d
commit df89d2e093
2 changed files with 48 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
layout/base/nsPresContext.cpp
View File

@ -130,51 +130,44 @@ nsPresContext::GetFontPreferences()
value = nsnull;
}
if (mLangGroup) {
nsAutoString pref("font.size.");
nsAutoString pref("font.size.variable.");
const PRUnichar* langGroup = nsnull;
mLangGroup->GetUnicode(&langGroup);
pref.Append(langGroup);
char name[128];
pref.ToCString(name, sizeof(name));
mPrefs->CopyCharPref(name, &value);
char* defaultSize = "16px";
if (!value) {
value = defaultSize;
PRInt32 variableSize = 16;
mPrefs->GetIntPref(name, &variableSize);
pref = "font.size.fixed.";
pref.Append(langGroup);
pref.ToCString(name, sizeof(name));
PRInt32 fixedSize = 14;
mPrefs->GetIntPref(name, &fixedSize);
char* unit = nsnull;
mPrefs->CopyCharPref("font.size.unit", &unit);
char* defaultUnit = "px";
if (!unit) {
unit = defaultUnit;
}
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")) {
if (!PL_strcmp(unit, "px")) {
float p2t;
GetScaledPixelsToTwips(&p2t);
sz = NSFloatPixelsToTwips((float) size, p2t);
mDefaultFont.size = sz;
mDefaultFixedFont.size = sz;
mDefaultFont.size = NSFloatPixelsToTwips((float) variableSize, p2t);
mDefaultFixedFont.size = NSFloatPixelsToTwips((float) fixedSize, p2t);
}
else if (!PL_strcmp(p, "pt")) {
sz = NSIntPointsToTwips(size);
mDefaultFont.size = sz;
mDefaultFixedFont.size = sz;
else if (!PL_strcmp(unit, "pt")) {
mDefaultFont.size = NSIntPointsToTwips(variableSize);
mDefaultFixedFont.size = NSIntPointsToTwips(fixedSize);
}
else {
float p2t;
GetScaledPixelsToTwips(&p2t);
sz = NSFloatPixelsToTwips(16.0, p2t);
mDefaultFont.size = sz;
mDefaultFixedFont.size = sz;
mDefaultFont.size = NSFloatPixelsToTwips((float) variableSize, p2t);
mDefaultFixedFont.size = NSFloatPixelsToTwips((float) fixedSize, p2t);
}
if (value != defaultSize) {
nsAllocator::Free(value);
value = nsnull;
if (unit != defaultUnit) {
nsAllocator::Free(unit);
unit = nsnull;
}
}
}

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

@ -130,51 +130,44 @@ nsPresContext::GetFontPreferences()
value = nsnull;
}
if (mLangGroup) {
nsAutoString pref("font.size.");
nsAutoString pref("font.size.variable.");
const PRUnichar* langGroup = nsnull;
mLangGroup->GetUnicode(&langGroup);
pref.Append(langGroup);
char name[128];
pref.ToCString(name, sizeof(name));
mPrefs->CopyCharPref(name, &value);
char* defaultSize = "16px";
if (!value) {
value = defaultSize;
PRInt32 variableSize = 16;
mPrefs->GetIntPref(name, &variableSize);
pref = "font.size.fixed.";
pref.Append(langGroup);
pref.ToCString(name, sizeof(name));
PRInt32 fixedSize = 14;
mPrefs->GetIntPref(name, &fixedSize);
char* unit = nsnull;
mPrefs->CopyCharPref("font.size.unit", &unit);
char* defaultUnit = "px";
if (!unit) {
unit = defaultUnit;
}
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")) {
if (!PL_strcmp(unit, "px")) {
float p2t;
GetScaledPixelsToTwips(&p2t);
sz = NSFloatPixelsToTwips((float) size, p2t);
mDefaultFont.size = sz;
mDefaultFixedFont.size = sz;
mDefaultFont.size = NSFloatPixelsToTwips((float) variableSize, p2t);
mDefaultFixedFont.size = NSFloatPixelsToTwips((float) fixedSize, p2t);
}
else if (!PL_strcmp(p, "pt")) {
sz = NSIntPointsToTwips(size);
mDefaultFont.size = sz;
mDefaultFixedFont.size = sz;
else if (!PL_strcmp(unit, "pt")) {
mDefaultFont.size = NSIntPointsToTwips(variableSize);
mDefaultFixedFont.size = NSIntPointsToTwips(fixedSize);
}
else {
float p2t;
GetScaledPixelsToTwips(&p2t);
sz = NSFloatPixelsToTwips(16.0, p2t);
mDefaultFont.size = sz;
mDefaultFixedFont.size = sz;
mDefaultFont.size = NSFloatPixelsToTwips((float) variableSize, p2t);
mDefaultFixedFont.size = NSFloatPixelsToTwips((float) fixedSize, p2t);
}
if (value != defaultSize) {
nsAllocator::Free(value);
value = nsnull;
if (unit != defaultUnit) {
nsAllocator::Free(unit);
unit = nsnull;
}
}
}