mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-27 06:43:32 +00:00
bug 45055 - align row heights on pixel boundaries when distributing extra space vertically. Work around block bug by rounding cells to even pixel boundary. sr=attinasi, r=bernd.mielke@snafu.de
This commit is contained in:
karnaze%netscape.com
parent
f595ed19f3
commit
1b04939e6f
@ -774,6 +774,7 @@ NS_METHOD nsTableCellFrame::Reflow(nsIPresContext* aPresContext,
|
||||
if (NS_UNCONSTRAINEDSIZE != cellHeight) {
|
||||
cellHeight += topInset + bottomInset;
|
||||
}
|
||||
cellHeight = nsTableFrame::RoundToPixel(cellHeight, p2t); // work around block rounding errors
|
||||
|
||||
// next determine the cell's width
|
||||
nscoord cellWidth = kidSize.width; // at this point, we've factored in the cell's style attributes
|
||||
@ -782,6 +783,7 @@ NS_METHOD nsTableCellFrame::Reflow(nsIPresContext* aPresContext,
|
||||
if (NS_UNCONSTRAINEDSIZE != cellWidth) {
|
||||
cellWidth += leftInset + rightInset;
|
||||
}
|
||||
cellWidth = nsTableFrame::RoundToPixel(cellWidth, p2t); // work around block rounding errors
|
||||
|
||||
// set the cell's desired size and max element size
|
||||
aDesiredSize.width = cellWidth;
|
||||
|
||||
@ -346,7 +346,8 @@ nsTableFrame::InterruptNotification(nsIPresContext* aPresContext,
|
||||
|
||||
nscoord
|
||||
nsTableFrame::RoundToPixel(nscoord aValue,
|
||||
float aPixelToTwips)
|
||||
float aPixelToTwips,
|
||||
PRBool aRoundUp)
|
||||
{
|
||||
nscoord halfPixel = NSToCoordRound(aPixelToTwips / 2.0f);
|
||||
nscoord fullPixel = NSToCoordRound(aPixelToTwips);
|
||||
@ -355,7 +356,7 @@ nsTableFrame::RoundToPixel(nscoord aValue,
|
||||
return aValue;
|
||||
}
|
||||
else {
|
||||
if (excess > halfPixel) {
|
||||
if ((excess > halfPixel) || aRoundUp) {
|
||||
return aValue + (fullPixel - excess);
|
||||
}
|
||||
else {
|
||||
@ -3214,15 +3215,12 @@ nsTableFrame::DistributeSpaceToCells(nsIPresContext* aPresContext,
|
||||
// now that all of the rows have been resized, resize the cells
|
||||
nsTableRowGroupFrame* rowGroupFrame = (nsTableRowGroupFrame*)aRowGroupFrame;
|
||||
nsIFrame * rowFrame = rowGroupFrame->GetFirstFrame();
|
||||
while (nsnull!=rowFrame) {
|
||||
while (rowFrame) {
|
||||
const nsStyleDisplay *rowDisplay;
|
||||
rowFrame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)rowDisplay));
|
||||
if (NS_STYLE_DISPLAY_TABLE_ROW == rowDisplay->mDisplay) {
|
||||
((nsTableRowFrame *)rowFrame)->DidResize(aPresContext, aReflowState);
|
||||
}
|
||||
// The calling function, DistributeSpaceToRows, takes care of the recursive row
|
||||
// group descent, which is why there's no NS_STYLE_DISPLAY_TABLE_ROW_GROUP case
|
||||
// here.
|
||||
rowGroupFrame->GetNextFrame(rowFrame, &rowFrame);
|
||||
}
|
||||
}
|
||||
@ -3233,7 +3231,7 @@ nsTableFrame::DistributeSpaceToRows(nsIPresContext* aPresContext,
|
||||
nsIFrame* aRowGroupFrame,
|
||||
nscoord aSumOfRowHeights,
|
||||
nscoord aExcess,
|
||||
nscoord& aExcessForRowGroup,
|
||||
nscoord& aExcessAllocated,
|
||||
nscoord& aRowGroupYPos)
|
||||
{
|
||||
// the rows in rowGroupFrame need to be expanded by rowHeightDelta[i]
|
||||
@ -3241,7 +3239,10 @@ nsTableFrame::DistributeSpaceToRows(nsIPresContext* aPresContext,
|
||||
nscoord cellSpacingY = GetCellSpacingY();
|
||||
nsTableRowGroupFrame* rowGroupFrame = (nsTableRowGroupFrame*)aRowGroupFrame;
|
||||
nsIFrame* rowFrame = rowGroupFrame->GetFirstFrame();
|
||||
nscoord excessForRowGroup = 0;
|
||||
nscoord y = 0;
|
||||
float p2t;
|
||||
aPresContext->GetPixelsToTwips(&p2t);
|
||||
while (rowFrame) {
|
||||
const nsStyleDisplay *rowDisplay;
|
||||
rowFrame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)rowDisplay));
|
||||
@ -3250,14 +3251,15 @@ nsTableFrame::DistributeSpaceToRows(nsIPresContext* aPresContext,
|
||||
nsRect rowRect;
|
||||
rowFrame->GetRect(rowRect);
|
||||
float percent = ((float)(rowRect.height)) / (float)aSumOfRowHeights;
|
||||
nscoord excessForRow = NSToCoordRound((float)aExcess * percent);
|
||||
nscoord excessForRow = RoundToPixel(NSToCoordRound((float)aExcess * percent), p2t, PR_TRUE);
|
||||
excessForRow = PR_MIN(excessForRow, aExcess - aExcessAllocated);
|
||||
|
||||
nsRect newRowRect(rowRect.x, y, rowRect.width, excessForRow + rowRect.height);
|
||||
rowFrame->SetRect(aPresContext, newRowRect);
|
||||
// better if this were part of an overloaded row::SetRect
|
||||
y += excessForRow + rowRect.height + cellSpacingY;
|
||||
y = newRowRect.YMost() + cellSpacingY;
|
||||
|
||||
aExcessForRowGroup += excessForRow;
|
||||
aExcessAllocated += excessForRow;
|
||||
excessForRowGroup += excessForRow;
|
||||
}
|
||||
|
||||
rowGroupFrame->GetNextFrame(rowFrame, &rowFrame);
|
||||
@ -3266,9 +3268,9 @@ nsTableFrame::DistributeSpaceToRows(nsIPresContext* aPresContext,
|
||||
nsRect rowGroupRect;
|
||||
aRowGroupFrame->GetRect(rowGroupRect);
|
||||
nsRect newRowGroupRect(rowGroupRect.x, aRowGroupYPos, rowGroupRect.width,
|
||||
aExcessForRowGroup + rowGroupRect.height);
|
||||
excessForRowGroup + rowGroupRect.height);
|
||||
aRowGroupFrame->SetRect(aPresContext, newRowGroupRect);
|
||||
aRowGroupYPos += aExcessForRowGroup + rowGroupRect.height;
|
||||
aRowGroupYPos = newRowGroupRect.YMost();
|
||||
|
||||
DistributeSpaceToCells(aPresContext, aReflowState, aRowGroupFrame);
|
||||
}
|
||||
@ -3329,16 +3331,14 @@ nsTableFrame::CalcDesiredHeight(nsIPresContext* aPresContext,
|
||||
sumOfRowHeights += rgFrame->GetHeightOfRows(aPresContext);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
nscoord excessAllocated = 0;
|
||||
for (rgX = 0; rgX < numRowGroups; rgX++) {
|
||||
nsTableRowGroupFrame* rgFrame =
|
||||
GetRowGroupFrame((nsIFrame*)rowGroups.ElementAt(rgX));
|
||||
if (rgFrame) {
|
||||
nscoord excessForGroup = 0;
|
||||
const nsStyleTable* tableStyle;
|
||||
GetStyleData(eStyleStruct_Table, (const nsStyleStruct *&)tableStyle);
|
||||
DistributeSpaceToRows(aPresContext, aReflowState, rgFrame, sumOfRowHeights,
|
||||
excess, excessForGroup, rowGroupYPos);
|
||||
excess, excessAllocated, rowGroupYPos);
|
||||
|
||||
// Make sure child views are properly positioned
|
||||
// XXX what happens if childFrame is a scroll frame and this gets skipped?
|
||||
|
||||
@ -187,7 +187,8 @@ public:
|
||||
|
||||
|
||||
static nscoord RoundToPixel(nscoord aValue,
|
||||
float aPixelToTwips);
|
||||
float aPixelToTwips,
|
||||
PRBool aRoundUp = PR_FALSE);
|
||||
|
||||
NS_IMETHOD IsPercentageBase(PRBool& aBase) const;
|
||||
|
||||
@ -633,7 +634,7 @@ protected:
|
||||
nsIFrame* aRowGroupFrame,
|
||||
nscoord aSumOfRowHeights,
|
||||
nscoord aExcess,
|
||||
nscoord& aExcessForRowGroup,
|
||||
nscoord& aExcessAllocated,
|
||||
nscoord& aRowGroupYPos);
|
||||
|
||||
void PlaceChild(nsIPresContext* aPresContext,
|
||||
|
||||
@ -774,6 +774,7 @@ NS_METHOD nsTableCellFrame::Reflow(nsIPresContext* aPresContext,
|
||||
if (NS_UNCONSTRAINEDSIZE != cellHeight) {
|
||||
cellHeight += topInset + bottomInset;
|
||||
}
|
||||
cellHeight = nsTableFrame::RoundToPixel(cellHeight, p2t); // work around block rounding errors
|
||||
|
||||
// next determine the cell's width
|
||||
nscoord cellWidth = kidSize.width; // at this point, we've factored in the cell's style attributes
|
||||
@ -782,6 +783,7 @@ NS_METHOD nsTableCellFrame::Reflow(nsIPresContext* aPresContext,
|
||||
if (NS_UNCONSTRAINEDSIZE != cellWidth) {
|
||||
cellWidth += leftInset + rightInset;
|
||||
}
|
||||
cellWidth = nsTableFrame::RoundToPixel(cellWidth, p2t); // work around block rounding errors
|
||||
|
||||
// set the cell's desired size and max element size
|
||||
aDesiredSize.width = cellWidth;
|
||||
|
||||
@ -346,7 +346,8 @@ nsTableFrame::InterruptNotification(nsIPresContext* aPresContext,
|
||||
|
||||
nscoord
|
||||
nsTableFrame::RoundToPixel(nscoord aValue,
|
||||
float aPixelToTwips)
|
||||
float aPixelToTwips,
|
||||
PRBool aRoundUp)
|
||||
{
|
||||
nscoord halfPixel = NSToCoordRound(aPixelToTwips / 2.0f);
|
||||
nscoord fullPixel = NSToCoordRound(aPixelToTwips);
|
||||
@ -355,7 +356,7 @@ nsTableFrame::RoundToPixel(nscoord aValue,
|
||||
return aValue;
|
||||
}
|
||||
else {
|
||||
if (excess > halfPixel) {
|
||||
if ((excess > halfPixel) || aRoundUp) {
|
||||
return aValue + (fullPixel - excess);
|
||||
}
|
||||
else {
|
||||
@ -3214,15 +3215,12 @@ nsTableFrame::DistributeSpaceToCells(nsIPresContext* aPresContext,
|
||||
// now that all of the rows have been resized, resize the cells
|
||||
nsTableRowGroupFrame* rowGroupFrame = (nsTableRowGroupFrame*)aRowGroupFrame;
|
||||
nsIFrame * rowFrame = rowGroupFrame->GetFirstFrame();
|
||||
while (nsnull!=rowFrame) {
|
||||
while (rowFrame) {
|
||||
const nsStyleDisplay *rowDisplay;
|
||||
rowFrame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)rowDisplay));
|
||||
if (NS_STYLE_DISPLAY_TABLE_ROW == rowDisplay->mDisplay) {
|
||||
((nsTableRowFrame *)rowFrame)->DidResize(aPresContext, aReflowState);
|
||||
}
|
||||
// The calling function, DistributeSpaceToRows, takes care of the recursive row
|
||||
// group descent, which is why there's no NS_STYLE_DISPLAY_TABLE_ROW_GROUP case
|
||||
// here.
|
||||
rowGroupFrame->GetNextFrame(rowFrame, &rowFrame);
|
||||
}
|
||||
}
|
||||
@ -3233,7 +3231,7 @@ nsTableFrame::DistributeSpaceToRows(nsIPresContext* aPresContext,
|
||||
nsIFrame* aRowGroupFrame,
|
||||
nscoord aSumOfRowHeights,
|
||||
nscoord aExcess,
|
||||
nscoord& aExcessForRowGroup,
|
||||
nscoord& aExcessAllocated,
|
||||
nscoord& aRowGroupYPos)
|
||||
{
|
||||
// the rows in rowGroupFrame need to be expanded by rowHeightDelta[i]
|
||||
@ -3241,7 +3239,10 @@ nsTableFrame::DistributeSpaceToRows(nsIPresContext* aPresContext,
|
||||
nscoord cellSpacingY = GetCellSpacingY();
|
||||
nsTableRowGroupFrame* rowGroupFrame = (nsTableRowGroupFrame*)aRowGroupFrame;
|
||||
nsIFrame* rowFrame = rowGroupFrame->GetFirstFrame();
|
||||
nscoord excessForRowGroup = 0;
|
||||
nscoord y = 0;
|
||||
float p2t;
|
||||
aPresContext->GetPixelsToTwips(&p2t);
|
||||
while (rowFrame) {
|
||||
const nsStyleDisplay *rowDisplay;
|
||||
rowFrame->GetStyleData(eStyleStruct_Display, ((const nsStyleStruct *&)rowDisplay));
|
||||
@ -3250,14 +3251,15 @@ nsTableFrame::DistributeSpaceToRows(nsIPresContext* aPresContext,
|
||||
nsRect rowRect;
|
||||
rowFrame->GetRect(rowRect);
|
||||
float percent = ((float)(rowRect.height)) / (float)aSumOfRowHeights;
|
||||
nscoord excessForRow = NSToCoordRound((float)aExcess * percent);
|
||||
nscoord excessForRow = RoundToPixel(NSToCoordRound((float)aExcess * percent), p2t, PR_TRUE);
|
||||
excessForRow = PR_MIN(excessForRow, aExcess - aExcessAllocated);
|
||||
|
||||
nsRect newRowRect(rowRect.x, y, rowRect.width, excessForRow + rowRect.height);
|
||||
rowFrame->SetRect(aPresContext, newRowRect);
|
||||
// better if this were part of an overloaded row::SetRect
|
||||
y += excessForRow + rowRect.height + cellSpacingY;
|
||||
y = newRowRect.YMost() + cellSpacingY;
|
||||
|
||||
aExcessForRowGroup += excessForRow;
|
||||
aExcessAllocated += excessForRow;
|
||||
excessForRowGroup += excessForRow;
|
||||
}
|
||||
|
||||
rowGroupFrame->GetNextFrame(rowFrame, &rowFrame);
|
||||
@ -3266,9 +3268,9 @@ nsTableFrame::DistributeSpaceToRows(nsIPresContext* aPresContext,
|
||||
nsRect rowGroupRect;
|
||||
aRowGroupFrame->GetRect(rowGroupRect);
|
||||
nsRect newRowGroupRect(rowGroupRect.x, aRowGroupYPos, rowGroupRect.width,
|
||||
aExcessForRowGroup + rowGroupRect.height);
|
||||
excessForRowGroup + rowGroupRect.height);
|
||||
aRowGroupFrame->SetRect(aPresContext, newRowGroupRect);
|
||||
aRowGroupYPos += aExcessForRowGroup + rowGroupRect.height;
|
||||
aRowGroupYPos = newRowGroupRect.YMost();
|
||||
|
||||
DistributeSpaceToCells(aPresContext, aReflowState, aRowGroupFrame);
|
||||
}
|
||||
@ -3329,16 +3331,14 @@ nsTableFrame::CalcDesiredHeight(nsIPresContext* aPresContext,
|
||||
sumOfRowHeights += rgFrame->GetHeightOfRows(aPresContext);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
nscoord excessAllocated = 0;
|
||||
for (rgX = 0; rgX < numRowGroups; rgX++) {
|
||||
nsTableRowGroupFrame* rgFrame =
|
||||
GetRowGroupFrame((nsIFrame*)rowGroups.ElementAt(rgX));
|
||||
if (rgFrame) {
|
||||
nscoord excessForGroup = 0;
|
||||
const nsStyleTable* tableStyle;
|
||||
GetStyleData(eStyleStruct_Table, (const nsStyleStruct *&)tableStyle);
|
||||
DistributeSpaceToRows(aPresContext, aReflowState, rgFrame, sumOfRowHeights,
|
||||
excess, excessForGroup, rowGroupYPos);
|
||||
excess, excessAllocated, rowGroupYPos);
|
||||
|
||||
// Make sure child views are properly positioned
|
||||
// XXX what happens if childFrame is a scroll frame and this gets skipped?
|
||||
|
||||
@ -187,7 +187,8 @@ public:
|
||||
|
||||
|
||||
static nscoord RoundToPixel(nscoord aValue,
|
||||
float aPixelToTwips);
|
||||
float aPixelToTwips,
|
||||
PRBool aRoundUp = PR_FALSE);
|
||||
|
||||
NS_IMETHOD IsPercentageBase(PRBool& aBase) const;
|
||||
|
||||
@ -633,7 +634,7 @@ protected:
|
||||
nsIFrame* aRowGroupFrame,
|
||||
nscoord aSumOfRowHeights,
|
||||
nscoord aExcess,
|
||||
nscoord& aExcessForRowGroup,
|
||||
nscoord& aExcessAllocated,
|
||||
nscoord& aRowGroupYPos);
|
||||
|
||||
void PlaceChild(nsIPresContext* aPresContext,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user