From c2c56781d38dabb187f4b3ac85428fb9b50d1255 Mon Sep 17 00:00:00 2001 From: "troy%netscape.com" Date: Sun, 31 Jan 1999 05:09:29 +0000 Subject: [PATCH] Changed ReflowFixedFrame() to take the computed left and top margin into account when placing the child git-svn-id: svn://10.0.0.236/trunk@19088 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsViewportFrame.cpp | 4 ++-- mozilla/layout/html/base/src/nsViewportFrame.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mozilla/layout/generic/nsViewportFrame.cpp b/mozilla/layout/generic/nsViewportFrame.cpp index 0e32748b780..4d0ec7fb353 100644 --- a/mozilla/layout/generic/nsViewportFrame.cpp +++ b/mozilla/layout/generic/nsViewportFrame.cpp @@ -179,8 +179,8 @@ ViewportFrame::ReflowFixedFrame(nsIPresContext& aPresContext, } // Position the child - nsRect rect(kidReflowState.computedOffsets.left, - kidReflowState.computedOffsets.top, + nsRect rect(kidReflowState.computedOffsets.left + kidReflowState.computedMargin.left, + kidReflowState.computedOffsets.top + kidReflowState.computedMargin.top, kidDesiredSize.width, kidDesiredSize.height); aKidFrame->SetRect(rect); htmlReflow->DidReflow(aPresContext, NS_FRAME_REFLOW_FINISHED); diff --git a/mozilla/layout/html/base/src/nsViewportFrame.cpp b/mozilla/layout/html/base/src/nsViewportFrame.cpp index 0e32748b780..4d0ec7fb353 100644 --- a/mozilla/layout/html/base/src/nsViewportFrame.cpp +++ b/mozilla/layout/html/base/src/nsViewportFrame.cpp @@ -179,8 +179,8 @@ ViewportFrame::ReflowFixedFrame(nsIPresContext& aPresContext, } // Position the child - nsRect rect(kidReflowState.computedOffsets.left, - kidReflowState.computedOffsets.top, + nsRect rect(kidReflowState.computedOffsets.left + kidReflowState.computedMargin.left, + kidReflowState.computedOffsets.top + kidReflowState.computedMargin.top, kidDesiredSize.width, kidDesiredSize.height); aKidFrame->SetRect(rect); htmlReflow->DidReflow(aPresContext, NS_FRAME_REFLOW_FINISHED);