corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Work in progress on absolutely positioned elements

Browse Source
This commit is contained in:
troy
1998-04-22 16:06:21 +00:00
parent 205759bad1
commit b2bd40548d
7 changed files with 38 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
layout/generic/nsBlockFrame.cpp
View File

@@ -34,6 +34,7 @@
#include "nsHTMLAtoms.h" #include "nsHTMLAtoms.h"
#include "nsHTMLValue.h" #include "nsHTMLValue.h"
#include "nsIHTMLContent.h" #include "nsIHTMLContent.h"
#include "nsAbsoluteFrame.h"
#include "nsIPtr.h" #include "nsIPtr.h"
#ifdef NS_DEBUG #ifdef NS_DEBUG
@@ -1294,8 +1295,11 @@ nsBlockFrame::ReflowAppendedChildren(nsIPresContext* aCX,
nsIStyleContextPtr kidSC = aCX->ResolveStyleContextFor(kid, this); nsIStyleContextPtr kidSC = aCX->ResolveStyleContextFor(kid, this);
nsStyleMolecule* kidMol = (nsStyleMolecule*)kidSC->GetData(kStyleMoleculeSID); nsStyleMolecule* kidMol = (nsStyleMolecule*)kidSC->GetData(kStyleMoleculeSID);
// Is it a floater? // Check whether it wants to floated or absolutely positioned
if (kidMol->floats != NS_STYLE_FLOAT_NONE) { if (NS_STYLE_POSITION_ABSOLUTE == kidMol->positionFlags) {
AbsoluteFrame::NewFrame(&kidFrame, kid, kidIndex, this);
kidFrame->SetStyleContext(kidSC);
} else if (kidMol->floats != NS_STYLE_FLOAT_NONE) {
PlaceholderFrame::NewFrame(&kidFrame, kid, kidIndex, this); PlaceholderFrame::NewFrame(&kidFrame, kid, kidIndex, this);
kidFrame->SetStyleContext(kidSC); kidFrame->SetStyleContext(kidSC);
} else if (nsnull == kidPrevInFlow) { } else if (nsnull == kidPrevInFlow) {

8
layout/generic/nsBlockReflowState.cpp
View File

@@ -34,6 +34,7 @@
#include "nsHTMLAtoms.h" #include "nsHTMLAtoms.h"
#include "nsHTMLValue.h" #include "nsHTMLValue.h"
#include "nsIHTMLContent.h" #include "nsIHTMLContent.h"
#include "nsAbsoluteFrame.h"
#include "nsIPtr.h" #include "nsIPtr.h"
#ifdef NS_DEBUG #ifdef NS_DEBUG
@@ -1294,8 +1295,11 @@ nsBlockFrame::ReflowAppendedChildren(nsIPresContext* aCX,
nsIStyleContextPtr kidSC = aCX->ResolveStyleContextFor(kid, this); nsIStyleContextPtr kidSC = aCX->ResolveStyleContextFor(kid, this);
nsStyleMolecule* kidMol = (nsStyleMolecule*)kidSC->GetData(kStyleMoleculeSID); nsStyleMolecule* kidMol = (nsStyleMolecule*)kidSC->GetData(kStyleMoleculeSID);
// Is it a floater? // Check whether it wants to floated or absolutely positioned
if (kidMol->floats != NS_STYLE_FLOAT_NONE) { if (NS_STYLE_POSITION_ABSOLUTE == kidMol->positionFlags) {
AbsoluteFrame::NewFrame(&kidFrame, kid, kidIndex, this);
kidFrame->SetStyleContext(kidSC);
} else if (kidMol->floats != NS_STYLE_FLOAT_NONE) {
PlaceholderFrame::NewFrame(&kidFrame, kid, kidIndex, this); PlaceholderFrame::NewFrame(&kidFrame, kid, kidIndex, this);
kidFrame->SetStyleContext(kidSC); kidFrame->SetStyleContext(kidSC);
} else if (nsnull == kidPrevInFlow) { } else if (nsnull == kidPrevInFlow) {

8
layout/generic/nsBlockReflowState.h
View File

@@ -34,6 +34,7 @@
#include "nsHTMLAtoms.h" #include "nsHTMLAtoms.h"
#include "nsHTMLValue.h" #include "nsHTMLValue.h"
#include "nsIHTMLContent.h" #include "nsIHTMLContent.h"
#include "nsAbsoluteFrame.h"
#include "nsIPtr.h" #include "nsIPtr.h"
#ifdef NS_DEBUG #ifdef NS_DEBUG
@@ -1294,8 +1295,11 @@ nsBlockFrame::ReflowAppendedChildren(nsIPresContext* aCX,
nsIStyleContextPtr kidSC = aCX->ResolveStyleContextFor(kid, this); nsIStyleContextPtr kidSC = aCX->ResolveStyleContextFor(kid, this);
nsStyleMolecule* kidMol = (nsStyleMolecule*)kidSC->GetData(kStyleMoleculeSID); nsStyleMolecule* kidMol = (nsStyleMolecule*)kidSC->GetData(kStyleMoleculeSID);
// Is it a floater? // Check whether it wants to floated or absolutely positioned
if (kidMol->floats != NS_STYLE_FLOAT_NONE) { if (NS_STYLE_POSITION_ABSOLUTE == kidMol->positionFlags) {
AbsoluteFrame::NewFrame(&kidFrame, kid, kidIndex, this);
kidFrame->SetStyleContext(kidSC);
} else if (kidMol->floats != NS_STYLE_FLOAT_NONE) {
PlaceholderFrame::NewFrame(&kidFrame, kid, kidIndex, this); PlaceholderFrame::NewFrame(&kidFrame, kid, kidIndex, this);
kidFrame->SetStyleContext(kidSC); kidFrame->SetStyleContext(kidSC);
} else if (nsnull == kidPrevInFlow) { } else if (nsnull == kidPrevInFlow) {

2
layout/html/base/src/makefile.win
View File

@@ -24,6 +24,7 @@ REQUIRES=xpcom raptor
DEFINES=-D_IMPL_NS_HTML DEFINES=-D_IMPL_NS_HTML
CPPSRCS= \ CPPSRCS= \
nsAbsoluteFrame.cpp \
nsBRPart.cpp \ nsBRPart.cpp \
nsBlockFrame.cpp \ nsBlockFrame.cpp \
nsBodyFrame.cpp \ nsBodyFrame.cpp \
@@ -54,6 +55,7 @@ CPPSRCS= \
$(NULL) $(NULL)
CPP_OBJS= \ CPP_OBJS= \
.\$(OBJDIR)\nsAbsoluteFrame.obj \
.\$(OBJDIR)\nsBRPart.obj \ .\$(OBJDIR)\nsBRPart.obj \
.\$(OBJDIR)\nsBlockFrame.obj \ .\$(OBJDIR)\nsBlockFrame.obj \
.\$(OBJDIR)\nsBodyFrame.obj \ .\$(OBJDIR)\nsBodyFrame.obj \

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

@@ -34,6 +34,7 @@
#include "nsHTMLAtoms.h" #include "nsHTMLAtoms.h"
#include "nsHTMLValue.h" #include "nsHTMLValue.h"
#include "nsIHTMLContent.h" #include "nsIHTMLContent.h"
#include "nsAbsoluteFrame.h"
#include "nsIPtr.h" #include "nsIPtr.h"
#ifdef NS_DEBUG #ifdef NS_DEBUG
@@ -1294,8 +1295,11 @@ nsBlockFrame::ReflowAppendedChildren(nsIPresContext* aCX,
nsIStyleContextPtr kidSC = aCX->ResolveStyleContextFor(kid, this); nsIStyleContextPtr kidSC = aCX->ResolveStyleContextFor(kid, this);
nsStyleMolecule* kidMol = (nsStyleMolecule*)kidSC->GetData(kStyleMoleculeSID); nsStyleMolecule* kidMol = (nsStyleMolecule*)kidSC->GetData(kStyleMoleculeSID);
// Is it a floater? // Check whether it wants to floated or absolutely positioned
if (kidMol->floats != NS_STYLE_FLOAT_NONE) { if (NS_STYLE_POSITION_ABSOLUTE == kidMol->positionFlags) {
AbsoluteFrame::NewFrame(&kidFrame, kid, kidIndex, this);
kidFrame->SetStyleContext(kidSC);
} else if (kidMol->floats != NS_STYLE_FLOAT_NONE) {
PlaceholderFrame::NewFrame(&kidFrame, kid, kidIndex, this); PlaceholderFrame::NewFrame(&kidFrame, kid, kidIndex, this);
kidFrame->SetStyleContext(kidSC); kidFrame->SetStyleContext(kidSC);
} else if (nsnull == kidPrevInFlow) { } else if (nsnull == kidPrevInFlow) {

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

@@ -34,6 +34,7 @@
#include "nsHTMLAtoms.h" #include "nsHTMLAtoms.h"
#include "nsHTMLValue.h" #include "nsHTMLValue.h"
#include "nsIHTMLContent.h" #include "nsIHTMLContent.h"
#include "nsAbsoluteFrame.h"
#include "nsIPtr.h" #include "nsIPtr.h"
#ifdef NS_DEBUG #ifdef NS_DEBUG
@@ -1294,8 +1295,11 @@ nsBlockFrame::ReflowAppendedChildren(nsIPresContext* aCX,
nsIStyleContextPtr kidSC = aCX->ResolveStyleContextFor(kid, this); nsIStyleContextPtr kidSC = aCX->ResolveStyleContextFor(kid, this);
nsStyleMolecule* kidMol = (nsStyleMolecule*)kidSC->GetData(kStyleMoleculeSID); nsStyleMolecule* kidMol = (nsStyleMolecule*)kidSC->GetData(kStyleMoleculeSID);
// Is it a floater? // Check whether it wants to floated or absolutely positioned
if (kidMol->floats != NS_STYLE_FLOAT_NONE) { if (NS_STYLE_POSITION_ABSOLUTE == kidMol->positionFlags) {
AbsoluteFrame::NewFrame(&kidFrame, kid, kidIndex, this);
kidFrame->SetStyleContext(kidSC);
} else if (kidMol->floats != NS_STYLE_FLOAT_NONE) {
PlaceholderFrame::NewFrame(&kidFrame, kid, kidIndex, this); PlaceholderFrame::NewFrame(&kidFrame, kid, kidIndex, this);
kidFrame->SetStyleContext(kidSC); kidFrame->SetStyleContext(kidSC);
} else if (nsnull == kidPrevInFlow) { } else if (nsnull == kidPrevInFlow) {

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

@@ -34,6 +34,7 @@
#include "nsHTMLAtoms.h" #include "nsHTMLAtoms.h"
#include "nsHTMLValue.h" #include "nsHTMLValue.h"
#include "nsIHTMLContent.h" #include "nsIHTMLContent.h"
#include "nsAbsoluteFrame.h"
#include "nsIPtr.h" #include "nsIPtr.h"
#ifdef NS_DEBUG #ifdef NS_DEBUG
@@ -1294,8 +1295,11 @@ nsBlockFrame::ReflowAppendedChildren(nsIPresContext* aCX,
nsIStyleContextPtr kidSC = aCX->ResolveStyleContextFor(kid, this); nsIStyleContextPtr kidSC = aCX->ResolveStyleContextFor(kid, this);
nsStyleMolecule* kidMol = (nsStyleMolecule*)kidSC->GetData(kStyleMoleculeSID); nsStyleMolecule* kidMol = (nsStyleMolecule*)kidSC->GetData(kStyleMoleculeSID);
// Is it a floater? // Check whether it wants to floated or absolutely positioned
if (kidMol->floats != NS_STYLE_FLOAT_NONE) { if (NS_STYLE_POSITION_ABSOLUTE == kidMol->positionFlags) {
AbsoluteFrame::NewFrame(&kidFrame, kid, kidIndex, this);
kidFrame->SetStyleContext(kidSC);
} else if (kidMol->floats != NS_STYLE_FLOAT_NONE) {
PlaceholderFrame::NewFrame(&kidFrame, kid, kidIndex, this); PlaceholderFrame::NewFrame(&kidFrame, kid, kidIndex, this);
kidFrame->SetStyleContext(kidSC); kidFrame->SetStyleContext(kidSC);
} else if (nsnull == kidPrevInFlow) { } else if (nsnull == kidPrevInFlow) {