Use default text alignment; setup opacity properly
git-svn-id: svn://10.0.0.236/trunk@2464 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
855722caee
commit
a1e84139ce
@ -85,9 +85,11 @@ void StyleColorImpl::ResetFrom(const nsStyleColor* aParent, nsIPresContext* aPre
|
||||
{
|
||||
if (nsnull != aParent) {
|
||||
mColor = aParent->mColor;
|
||||
mOpacity = aParent->mOpacity;
|
||||
}
|
||||
else {
|
||||
mColor = NS_RGB(0, 0, 0);
|
||||
mOpacity.SetPercentValue(1.0F);
|
||||
}
|
||||
|
||||
mBackgroundAttachment = NS_STYLE_BG_ATTACHMENT_SCROLL;
|
||||
@ -459,7 +461,7 @@ void StyleTextImpl::ResetFrom(const nsStyleText* aParent, nsIPresContext* aPresC
|
||||
mWordSpacing = aParent->mWordSpacing;
|
||||
}
|
||||
else {
|
||||
mTextAlign = NS_STYLE_TEXT_ALIGN_LEFT;
|
||||
mTextAlign = NS_STYLE_TEXT_ALIGN_DEFAULT;
|
||||
mTextTransform = NS_STYLE_TEXT_TRANSFORM_NONE;
|
||||
mWhiteSpace = NS_STYLE_WHITESPACE_NORMAL;
|
||||
|
||||
|
||||
@ -85,9 +85,11 @@ void StyleColorImpl::ResetFrom(const nsStyleColor* aParent, nsIPresContext* aPre
|
||||
{
|
||||
if (nsnull != aParent) {
|
||||
mColor = aParent->mColor;
|
||||
mOpacity = aParent->mOpacity;
|
||||
}
|
||||
else {
|
||||
mColor = NS_RGB(0, 0, 0);
|
||||
mOpacity.SetPercentValue(1.0F);
|
||||
}
|
||||
|
||||
mBackgroundAttachment = NS_STYLE_BG_ATTACHMENT_SCROLL;
|
||||
@ -459,7 +461,7 @@ void StyleTextImpl::ResetFrom(const nsStyleText* aParent, nsIPresContext* aPresC
|
||||
mWordSpacing = aParent->mWordSpacing;
|
||||
}
|
||||
else {
|
||||
mTextAlign = NS_STYLE_TEXT_ALIGN_LEFT;
|
||||
mTextAlign = NS_STYLE_TEXT_ALIGN_DEFAULT;
|
||||
mTextTransform = NS_STYLE_TEXT_TRANSFORM_NONE;
|
||||
mWhiteSpace = NS_STYLE_WHITESPACE_NORMAL;
|
||||
|
||||
|
||||
@ -85,9 +85,11 @@ void StyleColorImpl::ResetFrom(const nsStyleColor* aParent, nsIPresContext* aPre
|
||||
{
|
||||
if (nsnull != aParent) {
|
||||
mColor = aParent->mColor;
|
||||
mOpacity = aParent->mOpacity;
|
||||
}
|
||||
else {
|
||||
mColor = NS_RGB(0, 0, 0);
|
||||
mOpacity.SetPercentValue(1.0F);
|
||||
}
|
||||
|
||||
mBackgroundAttachment = NS_STYLE_BG_ATTACHMENT_SCROLL;
|
||||
@ -459,7 +461,7 @@ void StyleTextImpl::ResetFrom(const nsStyleText* aParent, nsIPresContext* aPresC
|
||||
mWordSpacing = aParent->mWordSpacing;
|
||||
}
|
||||
else {
|
||||
mTextAlign = NS_STYLE_TEXT_ALIGN_LEFT;
|
||||
mTextAlign = NS_STYLE_TEXT_ALIGN_DEFAULT;
|
||||
mTextTransform = NS_STYLE_TEXT_TRANSFORM_NONE;
|
||||
mWhiteSpace = NS_STYLE_WHITESPACE_NORMAL;
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user