Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-15 14:25:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improvements to fixed positioning

Browse Source
This commit is contained in:
troy%netscape.com 1999-02-03 17:01:51 +00:00
parent afba73dd7c
commit 5238d0c73f
2 changed files with 156 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
layout/generic/nsViewportFrame.cpp
View File

@ -20,8 +20,12 @@
#include "nsHTMLIIDs.h"
#include "nsLayoutAtoms.h"
#include "nsIViewManager.h"
#include "nsIScrollableView.h"
#include "nsIDeviceContext.h"
#include "nsIPresContext.h"
static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID);
static NS_DEFINE_IID(kScrollViewIID, NS_ISCROLLABLEVIEW_IID);
/**
* Viewport frame class.
@ -68,6 +72,11 @@ protected:
void ReflowFixedFrames(nsIPresContext& aPresContext,
const nsHTMLReflowState& aReflowState) const;
void CalculateFixedContainingBlockSize(nsIPresContext& aPresContext,
const nsHTMLReflowState& aReflowState,
nscoord& aWidth,
nscoord& aHeight) const;
private:
nsFrameList mFixedFrames; // additional named child list
};
@ -138,6 +147,47 @@ ViewportFrame::FirstChild(nsIAtom* aListName, nsIFrame*& aFirstChild) const
return nsContainerFrame::FirstChild(aListName, aFirstChild);
}
void
ViewportFrame::CalculateFixedContainingBlockSize(nsIPresContext& aPresContext,
const nsHTMLReflowState& aReflowState,
nscoord& aWidth,
nscoord& aHeight) const
{
// Initialize the values to the computed width/height in our reflow
// state struct
aWidth = aReflowState.computedWidth;
aHeight = aReflowState.computedHeight;
// Get our prinicpal child frame and see if we're scrollable
nsIFrame* kidFrame = mFrames.FirstChild();
nsIView* kidView;
kidFrame->GetView(kidView);
if (nsnull != kidView) {
nsIScrollableView* scrollingView;
if (NS_SUCCEEDED(kidView->QueryInterface(kScrollViewIID, (void**)&scrollingView))) {
// Get the scrollbar dimensions
float sbWidth, sbHeight;
nsIDeviceContext* dc = aPresContext.GetDeviceContext();
dc->GetScrollBarDimensions(sbWidth, sbHeight);
NS_RELEASE(dc);
// See if the scrollbars are visible
PRBool vertSBVisible, horzSBVisible;
scrollingView->GetScrollbarVisibility(&vertSBVisible, &horzSBVisible);
if (vertSBVisible) {
aWidth -= NSToCoordRound(sbWidth);
}
if (horzSBVisible) {
aHeight -= NSToCoordRound(sbHeight);
}
}
}
}
nsresult
ViewportFrame::ReflowFixedFrame(nsIPresContext& aPresContext,
const nsHTMLReflowState& aReflowState,
@ -199,12 +249,24 @@ ViewportFrame::ReflowFixedFrames(nsIPresContext& aPresContext,
NS_PRECONDITION(eReflowReason_Incremental != aReflowState.reason,
"unexpected reflow reason");
// Calculate how much room is available for the fixed items. That means
// determining if the viewport is scrollable and whether the vertical and/or
// horizontal scrollbars are visible
nscoord width, height;
CalculateFixedContainingBlockSize(aPresContext, aReflowState, width, height);
// Make a copy of the reflow state and change the computed width and height
// to reflect the available space for the fixed items
// XXX Find a cleaner way to do this...
nsHTMLReflowState reflowState(aReflowState);
reflowState.computedWidth = width;
reflowState.computedHeight = height;
nsIFrame* kidFrame;
for (kidFrame = mFixedFrames.FirstChild(); nsnull != kidFrame; kidFrame->GetNextSibling(kidFrame)) {
// Reflow the frame using our reflow reason
nsReflowStatus kidStatus;
ReflowFixedFrame(aPresContext, aReflowState, kidFrame, PR_FALSE,
kidStatus);
ReflowFixedFrame(aPresContext, reflowState, kidFrame, PR_FALSE, kidStatus);
}
}
@ -260,9 +322,21 @@ ViewportFrame::IncrementalReflow(nsIPresContext& aPresContext,
(nsIReflowCommand::FrameInserted == type)) {
while (numFrames-- > 0) {
nsReflowStatus status;
// Calculate how much room is available for the fixed items. That means
// determining if the viewport is scrollable and whether the vertical and/or
// horizontal scrollbars are visible
nscoord width, height;
CalculateFixedContainingBlockSize(aPresContext, aReflowState, width, height);
ReflowFixedFrame(aPresContext, aReflowState, newFrames, PR_TRUE, status);
// Make a copy of the reflow state and change the computed width and height
// to reflect the available space for the fixed items
// XXX Find a cleaner way to do this...
nsHTMLReflowState reflowState(aReflowState);
reflowState.computedWidth = width;
reflowState.computedHeight = height;
nsReflowStatus status;
ReflowFixedFrame(aPresContext, reflowState, newFrames, PR_TRUE, status);
newFrames->GetNextSibling(newFrames);
}
}

82
layout/html/base/src/nsViewportFrame.cpp
View File

@ -20,8 +20,12 @@
#include "nsHTMLIIDs.h"
#include "nsLayoutAtoms.h"
#include "nsIViewManager.h"
#include "nsIScrollableView.h"
#include "nsIDeviceContext.h"
#include "nsIPresContext.h"
static NS_DEFINE_IID(kIFrameIID, NS_IFRAME_IID);
static NS_DEFINE_IID(kScrollViewIID, NS_ISCROLLABLEVIEW_IID);
/**
* Viewport frame class.
@ -68,6 +72,11 @@ protected:
void ReflowFixedFrames(nsIPresContext& aPresContext,
const nsHTMLReflowState& aReflowState) const;
void CalculateFixedContainingBlockSize(nsIPresContext& aPresContext,
const nsHTMLReflowState& aReflowState,
nscoord& aWidth,
nscoord& aHeight) const;
private:
nsFrameList mFixedFrames; // additional named child list
};
@ -138,6 +147,47 @@ ViewportFrame::FirstChild(nsIAtom* aListName, nsIFrame*& aFirstChild) const
return nsContainerFrame::FirstChild(aListName, aFirstChild);
}
void
ViewportFrame::CalculateFixedContainingBlockSize(nsIPresContext& aPresContext,
const nsHTMLReflowState& aReflowState,
nscoord& aWidth,
nscoord& aHeight) const
{
// Initialize the values to the computed width/height in our reflow
// state struct
aWidth = aReflowState.computedWidth;
aHeight = aReflowState.computedHeight;
// Get our prinicpal child frame and see if we're scrollable
nsIFrame* kidFrame = mFrames.FirstChild();
nsIView* kidView;
kidFrame->GetView(kidView);
if (nsnull != kidView) {
nsIScrollableView* scrollingView;
if (NS_SUCCEEDED(kidView->QueryInterface(kScrollViewIID, (void**)&scrollingView))) {
// Get the scrollbar dimensions
float sbWidth, sbHeight;
nsIDeviceContext* dc = aPresContext.GetDeviceContext();
dc->GetScrollBarDimensions(sbWidth, sbHeight);
NS_RELEASE(dc);
// See if the scrollbars are visible
PRBool vertSBVisible, horzSBVisible;
scrollingView->GetScrollbarVisibility(&vertSBVisible, &horzSBVisible);
if (vertSBVisible) {
aWidth -= NSToCoordRound(sbWidth);
}
if (horzSBVisible) {
aHeight -= NSToCoordRound(sbHeight);
}
}
}
}
nsresult
ViewportFrame::ReflowFixedFrame(nsIPresContext& aPresContext,
const nsHTMLReflowState& aReflowState,
@ -199,12 +249,24 @@ ViewportFrame::ReflowFixedFrames(nsIPresContext& aPresContext,
NS_PRECONDITION(eReflowReason_Incremental != aReflowState.reason,
"unexpected reflow reason");
// Calculate how much room is available for the fixed items. That means
// determining if the viewport is scrollable and whether the vertical and/or
// horizontal scrollbars are visible
nscoord width, height;
CalculateFixedContainingBlockSize(aPresContext, aReflowState, width, height);
// Make a copy of the reflow state and change the computed width and height
// to reflect the available space for the fixed items
// XXX Find a cleaner way to do this...
nsHTMLReflowState reflowState(aReflowState);
reflowState.computedWidth = width;
reflowState.computedHeight = height;
nsIFrame* kidFrame;
for (kidFrame = mFixedFrames.FirstChild(); nsnull != kidFrame; kidFrame->GetNextSibling(kidFrame)) {
// Reflow the frame using our reflow reason
nsReflowStatus kidStatus;
ReflowFixedFrame(aPresContext, aReflowState, kidFrame, PR_FALSE,
kidStatus);
ReflowFixedFrame(aPresContext, reflowState, kidFrame, PR_FALSE, kidStatus);
}
}
@ -260,9 +322,21 @@ ViewportFrame::IncrementalReflow(nsIPresContext& aPresContext,
(nsIReflowCommand::FrameInserted == type)) {
while (numFrames-- > 0) {
nsReflowStatus status;
// Calculate how much room is available for the fixed items. That means
// determining if the viewport is scrollable and whether the vertical and/or
// horizontal scrollbars are visible
nscoord width, height;
CalculateFixedContainingBlockSize(aPresContext, aReflowState, width, height);
ReflowFixedFrame(aPresContext, aReflowState, newFrames, PR_TRUE, status);
// Make a copy of the reflow state and change the computed width and height
// to reflect the available space for the fixed items
// XXX Find a cleaner way to do this...
nsHTMLReflowState reflowState(aReflowState);
reflowState.computedWidth = width;
reflowState.computedHeight = height;
nsReflowStatus status;
ReflowFixedFrame(aPresContext, reflowState, newFrames, PR_TRUE, status);
newFrames->GetNextSibling(newFrames);
}
}