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

Added code to handle CSS margin properties

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@374 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
troy 1998-04-18 22:16:37 +00:00
parent a7dc1c48ab
commit ba24cf5205
3 changed files with 93 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
mozilla/content/html/style/src/nsCSSStyleRule.cpp
View File

@ -33,6 +33,7 @@ static NS_DEFINE_IID(kICSSStyleRuleIID, NS_ICSS_STYLE_RULE_IID);
static NS_DEFINE_IID(kStyleFontSID, NS_STYLEFONT_SID); static NS_DEFINE_IID(kStyleFontSID, NS_STYLEFONT_SID);
static NS_DEFINE_IID(kStyleColorSID, NS_STYLECOLOR_SID); static NS_DEFINE_IID(kStyleColorSID, NS_STYLECOLOR_SID);
static NS_DEFINE_IID(kStyleListSID, NS_STYLELIST_SID); static NS_DEFINE_IID(kStyleListSID, NS_STYLELIST_SID);
static NS_DEFINE_IID(kStyleMoleculeSID, NS_STYLEMOLECULE_SID);
static NS_DEFINE_IID(kCSSFontSID, NS_CSS_FONT_SID); static NS_DEFINE_IID(kCSSFontSID, NS_CSS_FONT_SID);
static NS_DEFINE_IID(kCSSColorSID, NS_CSS_COLOR_SID); static NS_DEFINE_IID(kCSSColorSID, NS_CSS_COLOR_SID);
@ -581,6 +582,36 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a
} }
} }
nsCSSMargin* ourMargin;
if (NS_OK == mDeclaration->GetData(kCSSMarginSID, (nsCSSStruct**)&ourMargin)) {
if (nsnull != ourMargin) {
nsStyleMolecule* hack = (nsStyleMolecule*)aContext->GetData(kStyleMoleculeSID);
// margin
if (nsnull != ourMargin->mMargin) {
if (ourMargin->mMargin->mLeft.IsLengthUnit()) {
hack->margin.left = CalcLength(ourMargin->mMargin->mLeft, font, aPresContext);
} else if (ourMargin->mMargin->mLeft.GetUnit() != eCSSUnit_Null) {
hack->margin.left = (nscoord)ourMargin->mMargin->mLeft.GetFloatValue();
}
if (ourMargin->mMargin->mTop.IsLengthUnit()) {
hack->margin.top = CalcLength(ourMargin->mMargin->mTop, font, aPresContext);
} else if (ourMargin->mMargin->mTop.GetUnit() != eCSSUnit_Null) {
hack->margin.top = (nscoord)ourMargin->mMargin->mTop.GetFloatValue();
}
if (ourMargin->mMargin->mRight.IsLengthUnit()) {
hack->margin.right = CalcLength(ourMargin->mMargin->mRight, font, aPresContext);
} else if (ourMargin->mMargin->mRight.GetUnit() != eCSSUnit_Null) {
hack->margin.right = (nscoord)ourMargin->mMargin->mRight.GetFloatValue();
}
if (ourMargin->mMargin->mBottom.IsLengthUnit()) {
hack->margin.bottom = CalcLength(ourMargin->mMargin->mBottom, font, aPresContext);
} else if (ourMargin->mMargin->mBottom.GetUnit() != eCSSUnit_Null) {
hack->margin.bottom = (nscoord)ourMargin->mMargin->mBottom.GetFloatValue();
}
}
}
}
nsCSSList* ourList; nsCSSList* ourList;
if (NS_OK == mDeclaration->GetData(kCSSListSID, (nsCSSStruct**)&ourList)) { if (NS_OK == mDeclaration->GetData(kCSSListSID, (nsCSSStruct**)&ourList)) {

31
mozilla/layout/html/style/src/nsCSSStyleRule.cpp
View File

@ -33,6 +33,7 @@ static NS_DEFINE_IID(kICSSStyleRuleIID, NS_ICSS_STYLE_RULE_IID);
static NS_DEFINE_IID(kStyleFontSID, NS_STYLEFONT_SID); static NS_DEFINE_IID(kStyleFontSID, NS_STYLEFONT_SID);
static NS_DEFINE_IID(kStyleColorSID, NS_STYLECOLOR_SID); static NS_DEFINE_IID(kStyleColorSID, NS_STYLECOLOR_SID);
static NS_DEFINE_IID(kStyleListSID, NS_STYLELIST_SID); static NS_DEFINE_IID(kStyleListSID, NS_STYLELIST_SID);
static NS_DEFINE_IID(kStyleMoleculeSID, NS_STYLEMOLECULE_SID);
static NS_DEFINE_IID(kCSSFontSID, NS_CSS_FONT_SID); static NS_DEFINE_IID(kCSSFontSID, NS_CSS_FONT_SID);
static NS_DEFINE_IID(kCSSColorSID, NS_CSS_COLOR_SID); static NS_DEFINE_IID(kCSSColorSID, NS_CSS_COLOR_SID);
@ -581,6 +582,36 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a
} }
} }
nsCSSMargin* ourMargin;
if (NS_OK == mDeclaration->GetData(kCSSMarginSID, (nsCSSStruct**)&ourMargin)) {
if (nsnull != ourMargin) {
nsStyleMolecule* hack = (nsStyleMolecule*)aContext->GetData(kStyleMoleculeSID);
// margin
if (nsnull != ourMargin->mMargin) {
if (ourMargin->mMargin->mLeft.IsLengthUnit()) {
hack->margin.left = CalcLength(ourMargin->mMargin->mLeft, font, aPresContext);
} else if (ourMargin->mMargin->mLeft.GetUnit() != eCSSUnit_Null) {
hack->margin.left = (nscoord)ourMargin->mMargin->mLeft.GetFloatValue();
}
if (ourMargin->mMargin->mTop.IsLengthUnit()) {
hack->margin.top = CalcLength(ourMargin->mMargin->mTop, font, aPresContext);
} else if (ourMargin->mMargin->mTop.GetUnit() != eCSSUnit_Null) {
hack->margin.top = (nscoord)ourMargin->mMargin->mTop.GetFloatValue();
}
if (ourMargin->mMargin->mRight.IsLengthUnit()) {
hack->margin.right = CalcLength(ourMargin->mMargin->mRight, font, aPresContext);
} else if (ourMargin->mMargin->mRight.GetUnit() != eCSSUnit_Null) {
hack->margin.right = (nscoord)ourMargin->mMargin->mRight.GetFloatValue();
}
if (ourMargin->mMargin->mBottom.IsLengthUnit()) {
hack->margin.bottom = CalcLength(ourMargin->mMargin->mBottom, font, aPresContext);
} else if (ourMargin->mMargin->mBottom.GetUnit() != eCSSUnit_Null) {
hack->margin.bottom = (nscoord)ourMargin->mMargin->mBottom.GetFloatValue();
}
}
}
}
nsCSSList* ourList; nsCSSList* ourList;
if (NS_OK == mDeclaration->GetData(kCSSListSID, (nsCSSStruct**)&ourList)) { if (NS_OK == mDeclaration->GetData(kCSSListSID, (nsCSSStruct**)&ourList)) {

31
mozilla/layout/style/nsCSSStyleRule.cpp
View File

@ -33,6 +33,7 @@ static NS_DEFINE_IID(kICSSStyleRuleIID, NS_ICSS_STYLE_RULE_IID);
static NS_DEFINE_IID(kStyleFontSID, NS_STYLEFONT_SID); static NS_DEFINE_IID(kStyleFontSID, NS_STYLEFONT_SID);
static NS_DEFINE_IID(kStyleColorSID, NS_STYLECOLOR_SID); static NS_DEFINE_IID(kStyleColorSID, NS_STYLECOLOR_SID);
static NS_DEFINE_IID(kStyleListSID, NS_STYLELIST_SID); static NS_DEFINE_IID(kStyleListSID, NS_STYLELIST_SID);
static NS_DEFINE_IID(kStyleMoleculeSID, NS_STYLEMOLECULE_SID);
static NS_DEFINE_IID(kCSSFontSID, NS_CSS_FONT_SID); static NS_DEFINE_IID(kCSSFontSID, NS_CSS_FONT_SID);
static NS_DEFINE_IID(kCSSColorSID, NS_CSS_COLOR_SID); static NS_DEFINE_IID(kCSSColorSID, NS_CSS_COLOR_SID);
@ -581,6 +582,36 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a
} }
} }
nsCSSMargin* ourMargin;
if (NS_OK == mDeclaration->GetData(kCSSMarginSID, (nsCSSStruct**)&ourMargin)) {
if (nsnull != ourMargin) {
nsStyleMolecule* hack = (nsStyleMolecule*)aContext->GetData(kStyleMoleculeSID);
// margin
if (nsnull != ourMargin->mMargin) {
if (ourMargin->mMargin->mLeft.IsLengthUnit()) {
hack->margin.left = CalcLength(ourMargin->mMargin->mLeft, font, aPresContext);
} else if (ourMargin->mMargin->mLeft.GetUnit() != eCSSUnit_Null) {
hack->margin.left = (nscoord)ourMargin->mMargin->mLeft.GetFloatValue();
}
if (ourMargin->mMargin->mTop.IsLengthUnit()) {
hack->margin.top = CalcLength(ourMargin->mMargin->mTop, font, aPresContext);
} else if (ourMargin->mMargin->mTop.GetUnit() != eCSSUnit_Null) {
hack->margin.top = (nscoord)ourMargin->mMargin->mTop.GetFloatValue();
}
if (ourMargin->mMargin->mRight.IsLengthUnit()) {
hack->margin.right = CalcLength(ourMargin->mMargin->mRight, font, aPresContext);
} else if (ourMargin->mMargin->mRight.GetUnit() != eCSSUnit_Null) {
hack->margin.right = (nscoord)ourMargin->mMargin->mRight.GetFloatValue();
}
if (ourMargin->mMargin->mBottom.IsLengthUnit()) {
hack->margin.bottom = CalcLength(ourMargin->mMargin->mBottom, font, aPresContext);
} else if (ourMargin->mMargin->mBottom.GetUnit() != eCSSUnit_Null) {
hack->margin.bottom = (nscoord)ourMargin->mMargin->mBottom.GetFloatValue();
}
}
}
}
nsCSSList* ourList; nsCSSList* ourList;
if (NS_OK == mDeclaration->GetData(kCSSListSID, (nsCSSStruct**)&ourList)) { if (NS_OK == mDeclaration->GetData(kCSSListSID, (nsCSSStruct**)&ourList)) {