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

bug 29459 - strategy's table min and max width is calculated to include

Browse Source 
percent and proportional cells. Stopped caching it. Calculate max element size better.


git-svn-id: svn://10.0.0.236/trunk@68947 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
karnaze%netscape.com
2000-05-10 00:54:00 +00:00
parent 71361e9a0b
commit f1700ddd48
14 changed files with 108 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mozilla/layout/tables/nsTableFrame.cpp
View File

@@ -1666,7 +1666,7 @@ NS_METHOD nsTableFrame::Reflow(nsIPresContext* aPresContext,
if (isAutoOrPctWidth) {
// Ask the strategy for the natural width of the content area
aDesiredSize.mMaximumWidth = mTableLayoutStrategy->GetTableMaxContentWidth();
aDesiredSize.mMaximumWidth = mTableLayoutStrategy->GetTableMaxWidth();
// Add in space for border
nsMargin border;
@@ -2796,18 +2796,14 @@ NS_METHOD nsTableFrame::IR_TargetIsChild(nsIPresContext* aPresContext,
nscoord nsTableFrame::ComputeDesiredWidth(const nsHTMLReflowState& aReflowState) const
{
nscoord desiredWidth = aReflowState.availableWidth;
// this is the biggest hack in the world. But there's no other rational way to handle nested percent tables
const nsStylePosition* position;
PRBool isNested = IsNested(aReflowState, position);
if ((eReflowReason_Initial==aReflowState.reason) &&
(isNested) && (eStyleUnit_Percent == position->mWidth.GetUnit())) {
if (NS_UNCONSTRAINEDSIZE == desiredWidth) {
nsITableLayoutStrategy* tableLayoutStrategy = mTableLayoutStrategy;
if (mPrevInFlow) {
// Get the table layout strategy from the first-in-flow
nsTableFrame* table = (nsTableFrame*)GetFirstInFlow();
tableLayoutStrategy = table->mTableLayoutStrategy;
}
desiredWidth = tableLayoutStrategy->GetTableMaxContentWidth();
desiredWidth = tableLayoutStrategy->GetTableMaxWidth();
}
return desiredWidth;
}
@@ -4146,20 +4142,20 @@ nscoord nsTableFrame::GetMinCaptionWidth()
}
/** return the minimum width of the table. Return 0 if the min width is unknown. */
nscoord nsTableFrame::GetMinTableContentWidth()
nscoord nsTableFrame::GetMinTableWidth()
{
nscoord result = 0;
if (nsnull!=mTableLayoutStrategy)
result = mTableLayoutStrategy->GetTableMinContentWidth();
result = mTableLayoutStrategy->GetTableMinWidth();
return result;
}
/** return the maximum width of the table. Return 0 if the max width is unknown. */
nscoord nsTableFrame::GetMaxTableContentWidth()
nscoord nsTableFrame::GetMaxTableWidth()
{
nscoord result = 0;
if (nsnull!=mTableLayoutStrategy)
result = mTableLayoutStrategy->GetTableMaxContentWidth();
result = mTableLayoutStrategy->GetTableMaxWidth();
return result;
}