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

Spanked to collapse inline-reflow with line-layout into line-layout; fixed bugs #1278, #1990, #3527, #1670, etc.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@24321 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kipp%netscape.com
1999-03-18 21:03:25 +00:00
parent f26bf52c02
commit 83f5d0de70
37 changed files with 4875 additions and 2836 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/layout/generic/nsBulletFrame.cpp
View File

@@ -71,6 +71,7 @@ nsBulletFrame::Paint(nsIPresContext& aCX,
if (disp->mVisible) {
const nsStyleList* myList =
(const nsStyleList*)mStyleContext->GetStyleData(eStyleStruct_List);
PRUint8 listStyleType = myList->mListStyleType;
if (myList->mListStyleImage.Length() > 0) {
nsIImage* image = mImageLoader.GetImage();
@@ -81,11 +82,14 @@ nsBulletFrame::Paint(nsIPresContext& aCX,
}
}
else {
nsRect innerArea(mPadding.left, mPadding.top,
mRect.width - (mPadding.left + mPadding.right),
mRect.height - (mPadding.top + mPadding.bottom));
aRenderingContext.DrawImage(image, innerArea);
return NS_OK;
if (!mImageLoader.GetLoadImageFailed()) {
nsRect innerArea(mPadding.left, mPadding.top,
mRect.width - (mPadding.left + mPadding.right),
mRect.height - (mPadding.top + mPadding.bottom));
aRenderingContext.DrawImage(image, innerArea);
return NS_OK;
}
listStyleType = NS_STYLE_LIST_STYLE_DISC;
}
}
@@ -98,7 +102,7 @@ nsBulletFrame::Paint(nsIPresContext& aCX,
aRenderingContext.SetColor(myColor->mColor);
nsAutoString text;
switch (myList->mListStyleType) {
switch (listStyleType) {
case NS_STYLE_LIST_STYLE_NONE:
break;