avoid marking columns that only have a desired width empty, what would exclude them from space redistribution, bug 194024, r=jkeiser sr=bzbarsky
This commit is contained in:
Родитель
c6e73f7b8a
Коммит
3d3b982d2a
|
@ -270,8 +270,9 @@ BasicTableLayoutStrategy::BalanceColumnWidths(nsIPresContext* aPresCont
|
|||
nscoord colMinWidth = colFrame->GetMinWidth();
|
||||
mTableFrame->SetColumnWidth(colX, colMinWidth);
|
||||
minTableWidth += colMinWidth;
|
||||
if ((colFrame->GetMinWidth() > 0) || (colFrame->GetFixWidth() > 0) ||
|
||||
(colFrame->GetPctWidth() > 0) || (colFrame->GetWidth(MIN_PRO) > 0)) {
|
||||
if ((colFrame->GetMinWidth() > 0) || (colFrame->GetDesWidth() > 0) ||
|
||||
(colFrame->GetFixWidth() > 0) || (colFrame->GetPctWidth() > 0) ||
|
||||
(colFrame->GetWidth(MIN_PRO) > 0)) {
|
||||
numNonZeroWidthCols++;
|
||||
}
|
||||
if (mTableFrame->GetNumCellsOriginatingInCol(colX) > 0) {
|
||||
|
|
|
@ -270,8 +270,9 @@ BasicTableLayoutStrategy::BalanceColumnWidths(nsIPresContext* aPresCont
|
|||
nscoord colMinWidth = colFrame->GetMinWidth();
|
||||
mTableFrame->SetColumnWidth(colX, colMinWidth);
|
||||
minTableWidth += colMinWidth;
|
||||
if ((colFrame->GetMinWidth() > 0) || (colFrame->GetFixWidth() > 0) ||
|
||||
(colFrame->GetPctWidth() > 0) || (colFrame->GetWidth(MIN_PRO) > 0)) {
|
||||
if ((colFrame->GetMinWidth() > 0) || (colFrame->GetDesWidth() > 0) ||
|
||||
(colFrame->GetFixWidth() > 0) || (colFrame->GetPctWidth() > 0) ||
|
||||
(colFrame->GetWidth(MIN_PRO) > 0)) {
|
||||
numNonZeroWidthCols++;
|
||||
}
|
||||
if (mTableFrame->GetNumCellsOriginatingInCol(colX) > 0) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче