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

93519 - new box-ordinal-group xul layout feature, r=waterson, sr=hyatt

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@103733 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
hewitt%netscape.com
2001-09-25 22:17:00 +00:00
parent a265cb4587
commit f15e8fc2e2
29 changed files with 537 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mozilla/content/shared/public/nsCSSPropList.h
View File

@@ -128,6 +128,7 @@ CSS_PROP(-moz-box-flex-group, box_flex_group, REFLOW) // XXX bug 3935
CSS_PROP(-moz-box-orient, box_orient, REFLOW) // XXX bug 3935
CSS_PROP(-moz-box-pack, box_pack, REFLOW) // XXX bug 3935
CSS_PROP(-moz-box-sizing, box_sizing, REFLOW) // XXX bug 3935
CSS_PROP(-moz-box-ordinal-group, box_ordinal_group, FRAMECHANGE)
CSS_PROP(caption-side, caption_side, REFLOW)
CSS_PROP(clear, clear, REFLOW)
CSS_PROP(clip, clip, VISUAL)

1
mozilla/content/shared/public/nsStyleStruct.h
View File

@@ -993,6 +993,7 @@ struct nsStyleXUL : public nsStyleStruct {
float mBoxFlex; // [reset] see nsStyleConsts.h
PRUint8 mBoxOrient; // [reset] see nsStyleConsts.h
PRUint8 mBoxPack; // [reset] see nsStyleConsts.h
PRUint32 mBoxOrdinal; // [reset] see nsStyleConsts.h
};
#endif

1
mozilla/content/shared/public/nsXULAtomList.h
View File

@@ -153,6 +153,7 @@ XUL_ATOM(vbox, "vbox")
XUL_ATOM(scrollbox, "scrollbox")
XUL_ATOM(mousethrough, "mousethrough")
XUL_ATOM(flex, "flex")
XUL_ATOM(ordinal, "ordinal")
XUL_ATOM(spring, "spring")
XUL_ATOM(orient, "orient")
XUL_ATOM(autostretch, "autostretch")

6
mozilla/content/shared/src/nsStyleStruct.cpp
View File

@@ -645,6 +645,7 @@ nsStyleXUL::nsStyleXUL()
mBoxFlex = 0.0f;
mBoxOrient = NS_STYLE_BOX_ORIENT_HORIZONTAL;
mBoxPack = NS_STYLE_BOX_PACK_START;
mBoxOrdinal = 1;
}
nsStyleXUL::~nsStyleXUL()
@@ -663,8 +664,11 @@ nsStyleXUL::CalcDifference(const nsStyleXUL& aOther) const
mBoxDirection == aOther.mBoxDirection &&
mBoxFlex == aOther.mBoxFlex &&
mBoxOrient == aOther.mBoxOrient &&
mBoxPack == aOther.mBoxPack)
mBoxPack == aOther.mBoxPack &&
mBoxOrdinal == aOther.mBoxOrdinal)
return NS_STYLE_HINT_NONE;
if (mBoxOrdinal != aOther.mBoxOrdinal)
return NS_STYLE_HINT_FRAMECHANGE;
return NS_STYLE_HINT_REFLOW;
}