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

Fix for bug 110094 -- winless plugins don't get right coordinates when scrolled, r=bnesse, sr=attinasi

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@112116 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
av%netscape.com
2002-01-14 23:16:37 +00:00
parent 53b62b7633
commit 21a5c77ebb
2 changed files with 38 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
mozilla/layout/generic/nsObjectFrame.cpp
View File

@@ -1486,24 +1486,31 @@ nsresult nsObjectFrame::GetWindowOriginInPixels(nsIPresContext * aPresContext, P
nsresult rv = NS_OK;
nsIView * parentWithView;
nsPoint origin;
nsPoint offset(0,0);
nsPoint origin(0,0);
GetOffsetFromView(aPresContext, origin, &parentWithView);
// if it's windowless we want to get the offset from the parent frame
if (aWindowless) {
nsIWidget* aWidget;
parentWithView->GetOffsetFromWidget(&offset.x, &offset.y, aWidget);
origin += offset;
// if it's windowless, let's make correction for some more things
if (aWindowless && parentWithView) {
nsPoint correction(0,0);
// parent view may be scrolled
parentWithView->GetPosition(&correction.x, &correction.y);
origin += correction;
// offset from widget
nsIWidget* aWidget;
correction = nsPoint(0, 0);
parentWithView->GetOffsetFromWidget(&correction.x, &correction.y, aWidget);
origin += correction;
// offset from parent frame
nsIFrame* parentFrame;
GetParentWithView(aPresContext, &parentFrame);
if(parentFrame) {
nsPoint originFrame;
parentFrame->GetOffsetFromView(aPresContext, originFrame, &parentWithView);
origin += originFrame;
if (parentFrame) {
correction = nsPoint(0, 0);
parentFrame->GetOffsetFromView(aPresContext, correction, &parentWithView);
origin += correction;
}
}

31
mozilla/layout/html/base/src/nsObjectFrame.cpp
View File

@@ -1486,24 +1486,31 @@ nsresult nsObjectFrame::GetWindowOriginInPixels(nsIPresContext * aPresContext, P
nsresult rv = NS_OK;
nsIView * parentWithView;
nsPoint origin;
nsPoint offset(0,0);
nsPoint origin(0,0);
GetOffsetFromView(aPresContext, origin, &parentWithView);
// if it's windowless we want to get the offset from the parent frame
if (aWindowless) {
nsIWidget* aWidget;
parentWithView->GetOffsetFromWidget(&offset.x, &offset.y, aWidget);
origin += offset;
// if it's windowless, let's make correction for some more things
if (aWindowless && parentWithView) {
nsPoint correction(0,0);
// parent view may be scrolled
parentWithView->GetPosition(&correction.x, &correction.y);
origin += correction;
// offset from widget
nsIWidget* aWidget;
correction = nsPoint(0, 0);
parentWithView->GetOffsetFromWidget(&correction.x, &correction.y, aWidget);
origin += correction;
// offset from parent frame
nsIFrame* parentFrame;
GetParentWithView(aPresContext, &parentFrame);
if(parentFrame) {
nsPoint originFrame;
parentFrame->GetOffsetFromView(aPresContext, originFrame, &parentWithView);
origin += originFrame;
if (parentFrame) {
correction = nsPoint(0, 0);
parentFrame->GetOffsetFromView(aPresContext, correction, &parentWithView);
origin += correction;
}
}