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

fixing relative div position bug with autoscroll

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@70128 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mjudge%netscape.com 2000-05-16 22:41:38 +00:00
parent 65b118d587
commit 44d73d55a6
3 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mozilla/content/base/src/nsSelection.cpp
View File

@ -3581,7 +3581,6 @@ nsDOMSelection::DoAutoScroll(nsIPresContext *aPresContext, nsIFrame *aFrame, nsP
nsIScrollableView *scrollableView = 0;
result = GetRootScrollableView(&scrollableView);
if (NS_SUCCEEDED(result) && scrollableView)
{
//
@ -3589,9 +3588,9 @@ nsDOMSelection::DoAutoScroll(nsIPresContext *aPresContext, nsIFrame *aFrame, nsP
//
const nsIView *cView = 0;
nsIView *scrolledView;
result = scrollableView->GetClipView(&cView);
scrollableView->GetScrolledView(scrolledView);
if (NS_SUCCEEDED(result) && cView)
{
//
@ -3623,16 +3622,15 @@ nsDOMSelection::DoAutoScroll(nsIPresContext *aPresContext, nsIFrame *aFrame, nsP
//
nsIView *view = (nsIView*)frameView;
nscoord x, y;
while (view && view != cView)
while (view && view != scrolledView)
{
result = view->GetParent(view);
if (NS_FAILED(result))
view = 0;
else if (view && view != cView)
else if (view && view != scrolledView)
{
result = view->GetPosition(&x, &y);
@ -3651,8 +3649,7 @@ nsDOMSelection::DoAutoScroll(nsIPresContext *aPresContext, nsIFrame *aFrame, nsP
}
}
}
if (view)
if (cView)
{
//
// See if aPoint is outside the clip view's boundaries.
@ -3661,7 +3658,7 @@ nsDOMSelection::DoAutoScroll(nsIPresContext *aPresContext, nsIFrame *aFrame, nsP
nsRect bounds;
result = view->GetBounds(bounds);
result = cView->GetBounds(bounds);
scrollableView->GetScrollPosition(bounds.x,bounds.y);
if (NS_SUCCEEDED(result))
{

15
mozilla/layout/base/src/nsSelection.cpp
View File

@ -3581,7 +3581,6 @@ nsDOMSelection::DoAutoScroll(nsIPresContext *aPresContext, nsIFrame *aFrame, nsP
nsIScrollableView *scrollableView = 0;
result = GetRootScrollableView(&scrollableView);
if (NS_SUCCEEDED(result) && scrollableView)
{
//
@ -3589,9 +3588,9 @@ nsDOMSelection::DoAutoScroll(nsIPresContext *aPresContext, nsIFrame *aFrame, nsP
//
const nsIView *cView = 0;
nsIView *scrolledView;
result = scrollableView->GetClipView(&cView);
scrollableView->GetScrolledView(scrolledView);
if (NS_SUCCEEDED(result) && cView)
{
//
@ -3623,16 +3622,15 @@ nsDOMSelection::DoAutoScroll(nsIPresContext *aPresContext, nsIFrame *aFrame, nsP
//
nsIView *view = (nsIView*)frameView;
nscoord x, y;
while (view && view != cView)
while (view && view != scrolledView)
{
result = view->GetParent(view);
if (NS_FAILED(result))
view = 0;
else if (view && view != cView)
else if (view && view != scrolledView)
{
result = view->GetPosition(&x, &y);
@ -3651,8 +3649,7 @@ nsDOMSelection::DoAutoScroll(nsIPresContext *aPresContext, nsIFrame *aFrame, nsP
}
}
}
if (view)
if (cView)
{
//
// See if aPoint is outside the clip view's boundaries.
@ -3661,7 +3658,7 @@ nsDOMSelection::DoAutoScroll(nsIPresContext *aPresContext, nsIFrame *aFrame, nsP
nsRect bounds;
result = view->GetBounds(bounds);
result = cView->GetBounds(bounds);
scrollableView->GetScrollPosition(bounds.x,bounds.y);
if (NS_SUCCEEDED(result))
{

15
mozilla/layout/generic/nsSelection.cpp
View File

@ -3581,7 +3581,6 @@ nsDOMSelection::DoAutoScroll(nsIPresContext *aPresContext, nsIFrame *aFrame, nsP
nsIScrollableView *scrollableView = 0;
result = GetRootScrollableView(&scrollableView);
if (NS_SUCCEEDED(result) && scrollableView)
{
//
@ -3589,9 +3588,9 @@ nsDOMSelection::DoAutoScroll(nsIPresContext *aPresContext, nsIFrame *aFrame, nsP
//
const nsIView *cView = 0;
nsIView *scrolledView;
result = scrollableView->GetClipView(&cView);
scrollableView->GetScrolledView(scrolledView);
if (NS_SUCCEEDED(result) && cView)
{
//
@ -3623,16 +3622,15 @@ nsDOMSelection::DoAutoScroll(nsIPresContext *aPresContext, nsIFrame *aFrame, nsP
//
nsIView *view = (nsIView*)frameView;
nscoord x, y;
while (view && view != cView)
while (view && view != scrolledView)
{
result = view->GetParent(view);
if (NS_FAILED(result))
view = 0;
else if (view && view != cView)
else if (view && view != scrolledView)
{
result = view->GetPosition(&x, &y);
@ -3651,8 +3649,7 @@ nsDOMSelection::DoAutoScroll(nsIPresContext *aPresContext, nsIFrame *aFrame, nsP
}
}
}
if (view)
if (cView)
{
//
// See if aPoint is outside the clip view's boundaries.
@ -3661,7 +3658,7 @@ nsDOMSelection::DoAutoScroll(nsIPresContext *aPresContext, nsIFrame *aFrame, nsP
nsRect bounds;
result = view->GetBounds(bounds);
result = cView->GetBounds(bounds);
scrollableView->GetScrollPosition(bounds.x,bounds.y);
if (NS_SUCCEEDED(result))
{