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

Added mZIndex to nsStylePosition. Absolutely positioned code now passed

Browse Source 
it along to view system


git-svn-id: svn://10.0.0.236/trunk@608 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
troy
1998-04-24 18:34:31 +00:00
parent 7c00209154
commit 200fd1ff3d
9 changed files with 56 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mozilla/content/base/src/nsStyleContext.cpp
View File

@@ -226,6 +226,7 @@ struct StylePositionImpl: public nsStylePosition {
mWidth = 0;
mHeightFlags = NS_STYLE_POSITION_VALUE_AUTO;
mHeight = 0;
mZIndex = 0;
}
~StylePositionImpl(void)

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

@@ -697,6 +697,13 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a
position->mHeight = (nscoord)(100 * ourPosition->mHeight.GetFloatValue());
position->mHeightFlags = NS_STYLE_POSITION_VALUE_PCT;
}
// z-index
if (ourPosition->mZIndex.GetUnit() == eCSSUnit_Enumerated) {
position->mPosition = ourPosition->mPosition.GetIntValue();
} else if (ourPosition->mZIndex.GetUnit() == eCSSUnit_Absolute) {
position->mZIndex = ourPosition->mZIndex.GetIntValue();
}
}
}

2
mozilla/layout/base/public/nsIStyleContext.h
View File

@@ -126,6 +126,8 @@ struct nsStylePosition : public nsStyleStruct {
nscoord mWidth;
PRUint8 mHeightFlags; // see nsStyleConsts.h
nscoord mHeight;
PRInt32 mZIndex;
};
//----------------------------------------------------------------------

1
mozilla/layout/base/src/nsStyleContext.cpp
View File

@@ -226,6 +226,7 @@ struct StylePositionImpl: public nsStylePosition {
mWidth = 0;
mHeightFlags = NS_STYLE_POSITION_VALUE_AUTO;
mHeight = 0;
mZIndex = 0;
}
~StylePositionImpl(void)

37
mozilla/layout/html/base/src/nsAbsoluteFrame.cpp
View File

@@ -29,6 +29,7 @@
#include "nsViewsCID.h"
static NS_DEFINE_IID(kStylePositionSID, NS_STYLEPOSITION_SID);
static NS_DEFINE_IID(kStyleMoleculeSID, NS_STYLEMOLECULE_SID);
static NS_DEFINE_IID(kIScrollableViewIID, NS_ISCROLLABLEVIEW_IID);
NS_DEF_PTR(nsIStyleContext);
@@ -63,7 +64,9 @@ AbsoluteFrame::~AbsoluteFrame()
{
}
nsIView* AbsoluteFrame::CreateView(nsIFrame* aContainingBlock, const nsRect& aRect)
nsIView* AbsoluteFrame::CreateView(nsIFrame* aContainingBlock,
const nsRect& aRect,
PRInt32 aZIndex)
{
nsIView* containingView;
nsIView* view;
@@ -91,12 +94,12 @@ nsIView* AbsoluteFrame::CreateView(nsIFrame* aContainingBlock, const nsRect& aRe
if (NS_OK == result) {
nsIView* scrolledView = scrollView->GetScrolledView();
view->Init(viewManager, aRect, scrolledView);
view->Init(viewManager, aRect, scrolledView, nsnull, nsnull, aZIndex);
viewManager->InsertChild(scrolledView, view, 0);
NS_RELEASE(scrolledView);
NS_RELEASE(scrollView);
} else {
view->Init(viewManager, aRect, containingView);
view->Init(viewManager, aRect, containingView, nsnull, nsnull, aZIndex);
viewManager->InsertChild(containingView, view, 0);
}
@@ -128,18 +131,24 @@ void AbsoluteFrame::ComputeViewsRect(nsIFrame* aContainingBlock, nsRect& aRect)
// the containing block
aRect.width = containingRect.width;
aRect.x = 0;
} else {
} else if (NS_STYLE_POSITION_VALUE_LENGTH == position->mWidthFlags) {
aRect.width = position->mWidth;
aRect.x = containingRect.width - aRect.width;
} else {
NS_ASSERTION(NS_STYLE_POSITION_VALUE_PCT == position->mWidthFlags, "unexpected width");
aRect.width = containingRect.width * position->mWidth / 100;
aRect.x = 0;
}
} else {
aRect.x = position->mLeftOffset;
if (NS_STYLE_POSITION_VALUE_AUTO == position->mWidthFlags) {
aRect.width = containingRect.width - aRect.x;
} else {
} else if (NS_STYLE_POSITION_VALUE_LENGTH == position->mWidthFlags) {
aRect.width = position->mWidth;
} else {
NS_ASSERTION(NS_STYLE_POSITION_VALUE_PCT == position->mWidthFlags, "unexpected width");
aRect.width = containingRect.width * position->mWidth / 100;
}
}
@@ -150,18 +159,24 @@ void AbsoluteFrame::ComputeViewsRect(nsIFrame* aContainingBlock, nsRect& aRect)
// the containing block
aRect.height = containingRect.height;
aRect.y = 0;
} else {
} else if (NS_STYLE_POSITION_VALUE_LENGTH == position->mHeightFlags) {
aRect.height = position->mHeight;
aRect.y = containingRect.height - aRect.height;
} else {
NS_ASSERTION(NS_STYLE_POSITION_VALUE_PCT == position->mHeightFlags, "unexpected height");
aRect.height = containingRect.height * position->mHeight / 100;
aRect.y = 0;
}
} else {
aRect.y = position->mTopOffset;
if (NS_STYLE_POSITION_VALUE_AUTO == position->mHeightFlags) {
aRect.height = containingRect.height - aRect.y;
} else {
} else if (NS_STYLE_POSITION_VALUE_LENGTH == position->mHeightFlags) {
aRect.height = position->mHeight;
} else {
NS_ASSERTION(NS_STYLE_POSITION_VALUE_PCT == position->mHeightFlags, "unexpected height");
aRect.height = containingRect.height * position->mHeight / 100;
}
}
}
@@ -233,7 +248,9 @@ NS_METHOD AbsoluteFrame::ResizeReflow(nsIPresContext* aPresContext,
ComputeViewsRect(containingBlock, rect);
// Create a view for the frame
nsIView* view = CreateView(containingBlock, rect);
nsStylePosition* position = (nsStylePosition*)mStyleContext->GetData(kStylePositionSID);
nsIView* view = CreateView(containingBlock, rect, position->mZIndex);
mFrame->SetView(view);
NS_RELEASE(view);

4
mozilla/layout/html/base/src/nsAbsoluteFrame.h
View File

@@ -53,7 +53,9 @@ protected:
virtual ~AbsoluteFrame();
nsIView* CreateView(nsIFrame* aContainingBlock, const nsRect& aRect);
nsIView* CreateView(nsIFrame* aContainingBlock,
const nsRect& aRect,
PRInt32 aZIndex);
nsIFrame* GetContainingBlock();
void ComputeViewsRect(nsIFrame* aContainingBlock, nsRect& aRect);
};

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

@@ -697,6 +697,13 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a
position->mHeight = (nscoord)(100 * ourPosition->mHeight.GetFloatValue());
position->mHeightFlags = NS_STYLE_POSITION_VALUE_PCT;
}
// z-index
if (ourPosition->mZIndex.GetUnit() == eCSSUnit_Enumerated) {
position->mPosition = ourPosition->mPosition.GetIntValue();
} else if (ourPosition->mZIndex.GetUnit() == eCSSUnit_Absolute) {
position->mZIndex = ourPosition->mZIndex.GetIntValue();
}
}
}

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

@@ -697,6 +697,13 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a
position->mHeight = (nscoord)(100 * ourPosition->mHeight.GetFloatValue());
position->mHeightFlags = NS_STYLE_POSITION_VALUE_PCT;
}
// z-index
if (ourPosition->mZIndex.GetUnit() == eCSSUnit_Enumerated) {
position->mPosition = ourPosition->mPosition.GetIntValue();
} else if (ourPosition->mZIndex.GetUnit() == eCSSUnit_Absolute) {
position->mZIndex = ourPosition->mZIndex.GetIntValue();
}
}
}

1
mozilla/layout/style/nsStyleContext.cpp
View File

@@ -226,6 +226,7 @@ struct StylePositionImpl: public nsStylePosition {
mWidth = 0;
mHeightFlags = NS_STYLE_POSITION_VALUE_AUTO;
mHeight = 0;
mZIndex = 0;
}
~StylePositionImpl(void)