93193 - cleaning up after align/pack xul box model changes, r=blake, sr=hyatt, 90741 - replacing box with hbox/vbox (from andersma@luther.edu), r=hewitt, sr=hyatt
git-svn-id: svn://10.0.0.236/trunk@100349 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -360,7 +360,7 @@ nsBoxFrameInner::CacheAttributes()
|
||||
printf("\n");
|
||||
*/
|
||||
|
||||
mValign = nsBoxFrame::vAlign_Middle;
|
||||
mValign = nsBoxFrame::vAlign_Top;
|
||||
mHalign = nsBoxFrame::hAlign_Left;
|
||||
|
||||
PRBool orient = PR_FALSE;
|
||||
@@ -441,9 +441,6 @@ nsBoxFrame::GetInitialHAlignment(nsBoxFrame::Halignment& aHalign)
|
||||
if (value.EqualsIgnoreCase("left")) {
|
||||
aHalign = nsBoxFrame::hAlign_Left;
|
||||
return PR_TRUE;
|
||||
} else if (value.EqualsIgnoreCase("center")) {
|
||||
aHalign = nsBoxFrame::hAlign_Center;
|
||||
return PR_TRUE;
|
||||
} else if (value.EqualsIgnoreCase("right")) {
|
||||
aHalign = nsBoxFrame::hAlign_Right;
|
||||
return PR_TRUE;
|
||||
@@ -1234,7 +1231,7 @@ nsBoxFrame::AttributeChanged(nsIPresContext* aPresContext,
|
||||
aAttribute == nsXULAtoms::autostretch) {
|
||||
|
||||
if (aAttribute == nsXULAtoms::orient || aAttribute == nsXULAtoms::debug || aAttribute == nsHTMLAtoms::align || aAttribute == nsHTMLAtoms::valign) {
|
||||
mInner->mValign = nsBoxFrame::vAlign_Middle;
|
||||
mInner->mValign = nsBoxFrame::vAlign_Top;
|
||||
mInner->mHalign = nsBoxFrame::hAlign_Left;
|
||||
|
||||
PRBool orient = PR_TRUE;
|
||||
|
||||
Reference in New Issue
Block a user