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

Align input type=text/radio/checkbox/button so that text is on baseline (bzbarsky's patch, bug 167236), r=jkeiser@netscape.com, sr=dbaron@fas.harvard.edu

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@130554 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jkeiser%netscape.com
2002-09-27 00:04:22 +00:00
parent b0e21eb3d2
commit d59bc1b4f8
6 changed files with 40 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/layout/html/forms/src/nsGfxButtonControlFrame.cpp
View File

@@ -258,8 +258,6 @@ nsGfxButtonControlFrame::DoNavQuirksReflow(nsIPresContext* aPresContext
aDesiredSize.width = desiredSize.width;
aDesiredSize.height = desiredSize.height;
aDesiredSize.ascent = aDesiredSize.height;
aDesiredSize.descent = 0;
} else {
// XXX ASSERT HERE
desiredSize.width = 0;
@@ -305,7 +303,7 @@ nsGfxButtonControlFrame::DoNavQuirksReflow(nsIPresContext* aPresContext
}
}
// now reflow the first child (genertaed content)
// now reflow the first child (generated content)
nsHTMLReflowState reflowState(aPresContext, aReflowState, firstKid, desiredSize, reason);
reflowState.mComputedWidth = desiredSize.width;
reflowState.mComputedHeight = desiredSize.height;
@@ -315,6 +313,10 @@ nsGfxButtonControlFrame::DoNavQuirksReflow(nsIPresContext* aPresContext
firstKid->GetRect(kidRect);
ReflowChild(firstKid, aPresContext, childReflowMetrics, reflowState, kidRect.x, kidRect.y, 0, aStatus);
aDesiredSize.ascent = childReflowMetrics.ascent +
aReflowState.mComputedBorderPadding.top;
aDesiredSize.descent = aDesiredSize.height - aDesiredSize.ascent;
// Center the child and add back in the border and badding
// our inner area frame is already doing centering so we only need to center vertically.
nsRect rect = nsRect(aReflowState.mComputedBorderPadding.left,