Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-22 03:43:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

More CSS position work

Browse Source
This commit is contained in:
troy 1998-04-23 15:39:48 +00:00
parent 1d6d64db53
commit 2c0ca536fc
11 changed files with 135 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
content/base/src/nsStyleContext.cpp
View File

@ -452,6 +452,9 @@ nsStyleStruct* StyleContextImpl::GetData(const nsIID& aSID)
if (aSID.Equals(kStyleListSID)) {
return &mList;
}
if (aSID.Equals(kStylePositionSID)) {
return &mPosition;
}
if (aSID.Equals(kStyleMoleculeSID)) {
return &mMolecule;
}

3
layout/base/src/nsStyleContext.cpp
View File

@ -452,6 +452,9 @@ nsStyleStruct* StyleContextImpl::GetData(const nsIID& aSID)
if (aSID.Equals(kStyleListSID)) {
return &mList;
}
if (aSID.Equals(kStylePositionSID)) {
return &mPosition;
}
if (aSID.Equals(kStyleMoleculeSID)) {
return &mMolecule;
}

4
layout/generic/nsBlockFrame.cpp
View File

@ -48,6 +48,7 @@
static NS_DEFINE_IID(kIRunaroundIID, NS_IRUNAROUND_IID);
static NS_DEFINE_IID(kIFloaterContainerIID, NS_IFLOATERCONTAINER_IID);
static NS_DEFINE_IID(kIAnchoredItemsIID, NS_IANCHOREDITEMS_IID);
static NS_DEFINE_IID(kStylePositionSID, NS_STYLEPOSITION_SID);
static NS_DEFINE_IID(kStyleMoleculeSID, NS_STYLEMOLECULE_SID);
static NS_DEFINE_IID(kStyleFontSID, NS_STYLEFONT_SID);
@ -1293,10 +1294,11 @@ nsBlockFrame::ReflowAppendedChildren(nsIPresContext* aCX,
// Resolve style for the kid
nsIStyleContextPtr kidSC = aCX->ResolveStyleContextFor(kid, this);
nsStylePosition* kidPosition = (nsStylePosition*)kidSC->GetData(kStylePositionSID);
nsStyleMolecule* kidMol = (nsStyleMolecule*)kidSC->GetData(kStyleMoleculeSID);
// Check whether it wants to floated or absolutely positioned
if (NS_STYLE_POSITION_ABSOLUTE == kidMol->positionFlags) {
if (NS_STYLE_POSITION_ABSOLUTE == kidPosition->mPosition) {
AbsoluteFrame::NewFrame(&kidFrame, kid, kidIndex, this);
kidFrame->SetStyleContext(kidSC);
} else if (kidMol->floats != NS_STYLE_FLOAT_NONE) {

4
layout/generic/nsBlockReflowState.cpp
View File

@ -48,6 +48,7 @@
static NS_DEFINE_IID(kIRunaroundIID, NS_IRUNAROUND_IID);
static NS_DEFINE_IID(kIFloaterContainerIID, NS_IFLOATERCONTAINER_IID);
static NS_DEFINE_IID(kIAnchoredItemsIID, NS_IANCHOREDITEMS_IID);
static NS_DEFINE_IID(kStylePositionSID, NS_STYLEPOSITION_SID);
static NS_DEFINE_IID(kStyleMoleculeSID, NS_STYLEMOLECULE_SID);
static NS_DEFINE_IID(kStyleFontSID, NS_STYLEFONT_SID);
@ -1293,10 +1294,11 @@ nsBlockFrame::ReflowAppendedChildren(nsIPresContext* aCX,
// Resolve style for the kid
nsIStyleContextPtr kidSC = aCX->ResolveStyleContextFor(kid, this);
nsStylePosition* kidPosition = (nsStylePosition*)kidSC->GetData(kStylePositionSID);
nsStyleMolecule* kidMol = (nsStyleMolecule*)kidSC->GetData(kStyleMoleculeSID);
// Check whether it wants to floated or absolutely positioned
if (NS_STYLE_POSITION_ABSOLUTE == kidMol->positionFlags) {
if (NS_STYLE_POSITION_ABSOLUTE == kidPosition->mPosition) {
AbsoluteFrame::NewFrame(&kidFrame, kid, kidIndex, this);
kidFrame->SetStyleContext(kidSC);
} else if (kidMol->floats != NS_STYLE_FLOAT_NONE) {

4
layout/generic/nsBlockReflowState.h
View File

@ -48,6 +48,7 @@
static NS_DEFINE_IID(kIRunaroundIID, NS_IRUNAROUND_IID);
static NS_DEFINE_IID(kIFloaterContainerIID, NS_IFLOATERCONTAINER_IID);
static NS_DEFINE_IID(kIAnchoredItemsIID, NS_IANCHOREDITEMS_IID);
static NS_DEFINE_IID(kStylePositionSID, NS_STYLEPOSITION_SID);
static NS_DEFINE_IID(kStyleMoleculeSID, NS_STYLEMOLECULE_SID);
static NS_DEFINE_IID(kStyleFontSID, NS_STYLEFONT_SID);
@ -1293,10 +1294,11 @@ nsBlockFrame::ReflowAppendedChildren(nsIPresContext* aCX,
// Resolve style for the kid
nsIStyleContextPtr kidSC = aCX->ResolveStyleContextFor(kid, this);
nsStylePosition* kidPosition = (nsStylePosition*)kidSC->GetData(kStylePositionSID);
nsStyleMolecule* kidMol = (nsStyleMolecule*)kidSC->GetData(kStyleMoleculeSID);
// Check whether it wants to floated or absolutely positioned
if (NS_STYLE_POSITION_ABSOLUTE == kidMol->positionFlags) {
if (NS_STYLE_POSITION_ABSOLUTE == kidPosition->mPosition) {
AbsoluteFrame::NewFrame(&kidFrame, kid, kidIndex, this);
kidFrame->SetStyleContext(kidSC);
} else if (kidMol->floats != NS_STYLE_FLOAT_NONE) {

144
layout/html/base/src/nsAbsoluteFrame.cpp
View File

@ -61,17 +61,13 @@ AbsoluteFrame::~AbsoluteFrame()
{
}
nsIView* AbsoluteFrame::CreateView(const nsRect& aRect)
nsIView* AbsoluteFrame::CreateView(nsIFrame* aContainingBlock, const nsRect& aRect)
{
nsIFrame* parent;
nsIView* parentView;
nsIView* containingView;
nsIView* view;
// Create a view for the frame and position it
// XXX This isn't correct. We should look for a containing frame that is absolutely
// positioned and use its local coordinate system, or the root content frame
GetParentWithView(parent);
parent->GetView(parentView);
aContainingBlock->GetView(containingView);
static NS_DEFINE_IID(kViewCID, NS_VIEW_CID);
static NS_DEFINE_IID(kIViewIID, NS_IVIEW_IID);
@ -80,20 +76,111 @@ nsIView* AbsoluteFrame::CreateView(const nsRect& aRect)
kIViewIID,
(void **)&view);
if (NS_OK == result) {
nsIViewManager* viewManager = parentView->GetViewManager();
nsIViewManager* viewManager = containingView->GetViewManager();
// Initialize the view
NS_ASSERTION(nsnull != viewManager, "null view manager");
view->Init(viewManager, aRect, parentView);
viewManager->InsertChild(parentView, view, 0);
view->Init(viewManager, aRect, containingView);
viewManager->InsertChild(containingView, view, 0);
NS_RELEASE(viewManager);
}
NS_RELEASE(parentView);
NS_RELEASE(containingView);
return view;
}
void AbsoluteFrame::ComputeViewsRect(nsIFrame* aContainingBlock, nsRect& aRect)
{
// Get the bounding rect for the containing block's view. This is used
// when computing the size of our view
nsIView* containingView;
nsRect containingRect;
aContainingBlock->GetView(containingView);
NS_ASSERTION(nsnull != containingView, "no view");
containingView->GetBounds(containingRect);
NS_RELEASE(containingView);
// Compute the offset and size for the view based on the position properties
nsStylePosition* position = (nsStylePosition*)mStyleContext->GetData(kStylePositionSID);
nsRect rect;
if (NS_STYLE_POSITION_VALUE_AUTO == position->mLeftOffsetFlags) {
// Left offset should be automatically computed
if (NS_STYLE_POSITION_VALUE_AUTO == position->mWidthFlags) {
// When both properties are 'auto' the width is the same as the width of
// the containing block
rect.width = containingRect.width;
rect.x = 0;
} else {
rect.width = position->mWidth;
rect.x = containingRect.width - rect.width;
}
} else {
rect.x = position->mLeftOffset;
if (NS_STYLE_POSITION_VALUE_AUTO == position->mWidthFlags) {
rect.width = containingRect.width - rect.x;
} else {
rect.width = position->mWidth;
}
}
if (NS_STYLE_POSITION_VALUE_AUTO == position->mTopOffsetFlags) {
// Top offset should be automatically computed
if (NS_STYLE_POSITION_VALUE_AUTO == position->mHeightFlags) {
// When both properties are 'auto' the height is the same as the height of
// the containing block
rect.height = containingRect.height;
rect.y = 0;
} else {
rect.height = position->mHeight;
rect.y = containingRect.height - rect.height;
}
} else {
rect.y = position->mTopOffset;
if (NS_STYLE_POSITION_VALUE_AUTO == position->mHeightFlags) {
rect.height = containingRect.height - rect.y;
} else {
rect.height = position->mHeight;
}
}
}
nsIFrame* AbsoluteFrame::GetContainingBlock()
{
// Look for a containing frame that is absolutely positioned. If we don't
// find one then use the initial containg block which is the root frame
nsIFrame* lastFrame = this;
nsIFrame* result;
GetContentParent(result);
while (nsnull != result) {
nsStylePosition* position;
// Get the style data
result->GetStyleData(kStylePositionSID, (nsStyleStruct*&)position);
if (position->mPosition == NS_STYLE_POSITION_ABSOLUTE) {
break;
}
// Get the next contentual parent
lastFrame = result;
result->GetContentParent(result);
}
if (nsnull == result) {
result = lastFrame;
}
return result;
}
NS_METHOD AbsoluteFrame::ResizeReflow(nsIPresContext* aPresContext,
nsReflowMetrics& aDesiredSize,
const nsSize& aMaxSize,
@ -122,45 +209,24 @@ NS_METHOD AbsoluteFrame::ResizeReflow(nsIPresContext* aPresContext,
mFrame->SetStyleContext(mStyleContext);
}
#if 0
// Get the containing block
nsIFrame* containingBlock = GetContainingBlock();
// Determine the view's rect
nsRect rect;
ComputeViews
#endif
// Compute the offset and size for the view based on the position properties
nsStylePosition* position = (nsStylePosition*)mStyleContext->GetData(kStylePositionSID);
nsRect rect;
if (NS_STYLE_POSITION_VALUE_AUTO == position->mLeftOffsetFlags) {
rect.x = 0;
// Left offset should be automatically computed
if (NS_STYLE_POSITION_VALUE_AUTO == position->mWidthFlags) {
// When all three properties are 'auto' the width is the same as the
// width of the containing block
rect.width = 3500; // XXX Fix me
} else {
rect.width = position->mWidth;
// rect.x = containingRect->width - rect.width;
}
} else {
rect.x = position->mLeftOffset;
// rect.width = containingRect->width - rect.x;
}
ComputeViewsRect(containingBlock, rect);
// Create a view for the frame
nsIView* view = CreateView(rect);
nsIView* view = CreateView(containingBlock, rect);
mFrame->SetView(view);
NS_RELEASE(view);
// Resize reflow the anchored item into the available space
mFrame->ResizeReflow(aPresContext, aDesiredSize, aMaxSize, nsnull, aStatus);
mFrame->SizeTo(aDesiredSize.width, aDesiredSize.height);
// Resize reflow the absolutely positioned element
nsSize availSize(rect.width, rect.height);
mFrame->ResizeReflow(aPresContext, aDesiredSize, availSize, nsnull, aStatus);
mFrame->SizeTo(rect.width, rect.height);
}
// Return our desired size as (0, 0)

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

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

4
layout/html/base/src/nsBlockFrame.cpp
View File

@ -48,6 +48,7 @@
static NS_DEFINE_IID(kIRunaroundIID, NS_IRUNAROUND_IID);
static NS_DEFINE_IID(kIFloaterContainerIID, NS_IFLOATERCONTAINER_IID);
static NS_DEFINE_IID(kIAnchoredItemsIID, NS_IANCHOREDITEMS_IID);
static NS_DEFINE_IID(kStylePositionSID, NS_STYLEPOSITION_SID);
static NS_DEFINE_IID(kStyleMoleculeSID, NS_STYLEMOLECULE_SID);
static NS_DEFINE_IID(kStyleFontSID, NS_STYLEFONT_SID);
@ -1293,10 +1294,11 @@ nsBlockFrame::ReflowAppendedChildren(nsIPresContext* aCX,
// Resolve style for the kid
nsIStyleContextPtr kidSC = aCX->ResolveStyleContextFor(kid, this);
nsStylePosition* kidPosition = (nsStylePosition*)kidSC->GetData(kStylePositionSID);
nsStyleMolecule* kidMol = (nsStyleMolecule*)kidSC->GetData(kStyleMoleculeSID);
// Check whether it wants to floated or absolutely positioned
if (NS_STYLE_POSITION_ABSOLUTE == kidMol->positionFlags) {
if (NS_STYLE_POSITION_ABSOLUTE == kidPosition->mPosition) {
AbsoluteFrame::NewFrame(&kidFrame, kid, kidIndex, this);
kidFrame->SetStyleContext(kidSC);
} else if (kidMol->floats != NS_STYLE_FLOAT_NONE) {

4
layout/html/base/src/nsBlockReflowState.cpp
View File

@ -48,6 +48,7 @@
static NS_DEFINE_IID(kIRunaroundIID, NS_IRUNAROUND_IID);
static NS_DEFINE_IID(kIFloaterContainerIID, NS_IFLOATERCONTAINER_IID);
static NS_DEFINE_IID(kIAnchoredItemsIID, NS_IANCHOREDITEMS_IID);
static NS_DEFINE_IID(kStylePositionSID, NS_STYLEPOSITION_SID);
static NS_DEFINE_IID(kStyleMoleculeSID, NS_STYLEMOLECULE_SID);
static NS_DEFINE_IID(kStyleFontSID, NS_STYLEFONT_SID);
@ -1293,10 +1294,11 @@ nsBlockFrame::ReflowAppendedChildren(nsIPresContext* aCX,
// Resolve style for the kid
nsIStyleContextPtr kidSC = aCX->ResolveStyleContextFor(kid, this);
nsStylePosition* kidPosition = (nsStylePosition*)kidSC->GetData(kStylePositionSID);
nsStyleMolecule* kidMol = (nsStyleMolecule*)kidSC->GetData(kStyleMoleculeSID);
// Check whether it wants to floated or absolutely positioned
if (NS_STYLE_POSITION_ABSOLUTE == kidMol->positionFlags) {
if (NS_STYLE_POSITION_ABSOLUTE == kidPosition->mPosition) {
AbsoluteFrame::NewFrame(&kidFrame, kid, kidIndex, this);
kidFrame->SetStyleContext(kidSC);
} else if (kidMol->floats != NS_STYLE_FLOAT_NONE) {

4
layout/html/base/src/nsBlockReflowState.h
View File

@ -48,6 +48,7 @@
static NS_DEFINE_IID(kIRunaroundIID, NS_IRUNAROUND_IID);
static NS_DEFINE_IID(kIFloaterContainerIID, NS_IFLOATERCONTAINER_IID);
static NS_DEFINE_IID(kIAnchoredItemsIID, NS_IANCHOREDITEMS_IID);
static NS_DEFINE_IID(kStylePositionSID, NS_STYLEPOSITION_SID);
static NS_DEFINE_IID(kStyleMoleculeSID, NS_STYLEMOLECULE_SID);
static NS_DEFINE_IID(kStyleFontSID, NS_STYLEFONT_SID);
@ -1293,10 +1294,11 @@ nsBlockFrame::ReflowAppendedChildren(nsIPresContext* aCX,
// Resolve style for the kid
nsIStyleContextPtr kidSC = aCX->ResolveStyleContextFor(kid, this);
nsStylePosition* kidPosition = (nsStylePosition*)kidSC->GetData(kStylePositionSID);
nsStyleMolecule* kidMol = (nsStyleMolecule*)kidSC->GetData(kStyleMoleculeSID);
// Check whether it wants to floated or absolutely positioned
if (NS_STYLE_POSITION_ABSOLUTE == kidMol->positionFlags) {
if (NS_STYLE_POSITION_ABSOLUTE == kidPosition->mPosition) {
AbsoluteFrame::NewFrame(&kidFrame, kid, kidIndex, this);
kidFrame->SetStyleContext(kidSC);
} else if (kidMol->floats != NS_STYLE_FLOAT_NONE) {

3
layout/style/nsStyleContext.cpp
View File

@ -452,6 +452,9 @@ nsStyleStruct* StyleContextImpl::GetData(const nsIID& aSID)
if (aSID.Equals(kStyleListSID)) {
return &mList;
}
if (aSID.Equals(kStylePositionSID)) {
return &mPosition;
}
if (aSID.Equals(kStyleMoleculeSID)) {
return &mMolecule;
}