Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed border subtraction from out table frame and adjusted in layout strategy.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@47175 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
karnaze%netscape.com
1999-09-13 21:45:58 +00:00
parent 3aa6d81b6f
commit cb8caac5a9
4 changed files with 20 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mozilla/layout/tables/BasicTableLayoutStrategy.cpp
View File

@@ -149,18 +149,15 @@ BasicTableLayoutStrategy::BalanceColumnWidths(nsIStyleContext* aTableSty
if (!tableIsAutoWidth && (specifiedTableWidth > 0)) {
maxWidth = PR_MIN(specifiedTableWidth, aMaxWidthIn); // specifiedWidth usually == aMaxWidthIn for fixed table
}
// reduce the maxWidth by border and padding in some cases, since we will be dealing with content width
if (!tableIsAutoWidth && (maxWidth != NS_UNCONSTRAINEDSIZE)) {
const nsStylePosition* position;
mTableFrame->GetStyleData(eStyleStruct_Position, ((const nsStyleStruct *&)position));
if (eStyleUnit_Percent != position->mWidth.GetUnit()) {
const nsStyleSpacing* spacing;
mTableFrame->GetStyleData(eStyleStruct_Spacing, (const nsStyleStruct *&)spacing);
nsMargin borderPadding;
spacing->CalcBorderPaddingFor(mTableFrame, borderPadding);
maxWidth -= borderPadding.left + borderPadding.right;
maxWidth = PR_MAX(0, maxWidth);
}
// reduce the maxWidth by border and padding, since we will be dealing with content width
// XXX should this be done in aMaxWidthIn by the caller?
if (maxWidth != NS_UNCONSTRAINEDSIZE) {
const nsStyleSpacing* spacing;
mTableFrame->GetStyleData(eStyleStruct_Spacing, (const nsStyleStruct *&)spacing);
nsMargin borderPadding;
spacing->CalcBorderPaddingFor(mTableFrame, borderPadding);
maxWidth -= borderPadding.left + borderPadding.right;
maxWidth = PR_MAX(0, maxWidth);
}
// set the table's columns to the min width
// initialize the col percent and cell percent values to 0.