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

Bug 215042 - frame source is not shown

Browse Source 
Patch from bzbarsky@mit.edu
r+sr=roc@ocallahan.org
This commit is contained in:
caillon%returnzero.com 2003-09-13 19:42:43 +00:00
parent a7aa61013a
commit 46b7fd3b1d
2 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
layout/generic/nsFrameSetFrame.cpp
View File

@ -482,16 +482,26 @@ void nsHTMLFramesetFrame::Scale(nscoord aDesired,
actual += aItems[j];
}
float factor = (float)aDesired / (float)actual;
actual = 0;
// scale the items up or down
for (i = 0; i < aNumIndicies; i++) {
j = aIndicies[i];
aItems[j] = NSToCoordRound((float)aItems[j] * factor);
actual += aItems[j];
if (actual > 0) {
float factor = (float)aDesired / (float)actual;
actual = 0;
// scale the items up or down
for (i = 0; i < aNumIndicies; i++) {
j = aIndicies[i];
aItems[j] = NSToCoordRound((float)aItems[j] * factor);
actual += aItems[j];
}
} else if (aNumIndicies != 0) {
// All the specs say zero width, but we have to fill up space
// somehow. Distribute it equally.
nscoord width = NSToCoordRound((float)aDesired / (float)aNumIndicies);
actual = width * aNumIndicies;
for (i = 0; i < aNumIndicies; i++) {
aItems[aIndicies[i]] = width;
}
}
if ((aNumIndicies > 0) && (aDesired != actual)) {
if (aNumIndicies > 0 && aDesired != actual) {
PRInt32 unit = (aDesired > actual) ? 1 : -1;
for (i=0; (i < aNumIndicies) && (aDesired != actual); i++) {
j = aIndicies[i];

26
layout/html/document/src/nsFrameSetFrame.cpp
View File

@ -482,16 +482,26 @@ void nsHTMLFramesetFrame::Scale(nscoord aDesired,
actual += aItems[j];
}
float factor = (float)aDesired / (float)actual;
actual = 0;
// scale the items up or down
for (i = 0; i < aNumIndicies; i++) {
j = aIndicies[i];
aItems[j] = NSToCoordRound((float)aItems[j] * factor);
actual += aItems[j];
if (actual > 0) {
float factor = (float)aDesired / (float)actual;
actual = 0;
// scale the items up or down
for (i = 0; i < aNumIndicies; i++) {
j = aIndicies[i];
aItems[j] = NSToCoordRound((float)aItems[j] * factor);
actual += aItems[j];
}
} else if (aNumIndicies != 0) {
// All the specs say zero width, but we have to fill up space
// somehow. Distribute it equally.
nscoord width = NSToCoordRound((float)aDesired / (float)aNumIndicies);
actual = width * aNumIndicies;
for (i = 0; i < aNumIndicies; i++) {
aItems[aIndicies[i]] = width;
}
}
if ((aNumIndicies > 0) && (aDesired != actual)) {
if (aNumIndicies > 0 && aDesired != actual) {
PRInt32 unit = (aDesired > actual) ? 1 : -1;
for (i=0; (i < aNumIndicies) && (aDesired != actual); i++) {
j = aIndicies[i];