Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-12 17:22:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for 78344. r=blake, sr=ben

Browse Source
This commit is contained in:
hyatt%netscape.com 2001-10-07 06:32:36 +00:00
parent 71405e70d7
commit 80ff494561
2 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
content/events/src/nsDOMEvent.cpp
View File

@ -643,6 +643,11 @@ NS_METHOD nsDOMEvent::GetClientX(PRInt32* aClientX)
NS_ADDREF(parent);
nsIWidget* tmp;
while (rootWidget != parent && nsnull != parent) {
nsWindowType windowType;
parent->GetWindowType(windowType);
if (windowType == eWindowType_popup)
break;
parent->GetBounds(bounds);
offset.x += bounds.x;
tmp = parent;
@ -689,6 +694,11 @@ NS_METHOD nsDOMEvent::GetClientY(PRInt32* aClientY)
NS_ADDREF(parent);
nsIWidget* tmp;
while (rootWidget != parent && nsnull != parent) {
nsWindowType windowType;
parent->GetWindowType(windowType);
if (windowType == eWindowType_popup)
break;
parent->GetBounds(bounds);
offset.y += bounds.y;
tmp = parent;

41
layout/xul/base/src/nsSliderFrame.cpp
View File

@ -61,6 +61,7 @@
#include "nsHTMLAtoms.h"
#include "nsIDOMEventReceiver.h"
#include "nsIViewManager.h"
#include "nsIWidget.h"
#include "nsIDOMMouseEvent.h"
#include "nsIDocument.h"
#include "nsScrollbarButtonFrame.h"
@ -499,24 +500,36 @@ nsSliderFrame::HandleEvent(nsIPresContext* aPresContext,
nsIFrame* parent = this;
while(parent != nsnull)
{
// if we hit a scrollable view make sure we take into account
// how much we are scrolled.
nsIScrollableView* scrollingView;
nsIView* view;
parent->GetView(aPresContext, &view);
if (view) {
nsresult result = view->QueryInterface(NS_GET_IID(nsIScrollableView), (void**)&scrollingView);
if (NS_SUCCEEDED(result)) {
nscoord xoff = 0;
nscoord yoff = 0;
scrollingView->GetScrollPosition(xoff, yoff);
isHorizontal ? start += xoff : start += yoff;
}
}
// if we hit a scrollable view make sure we take into account
// how much we are scrolled.
nsIScrollableView* scrollingView;
nsIView* view;
parent->GetView(aPresContext, &view);
if (view) {
nsresult result = view->QueryInterface(NS_GET_IID(nsIScrollableView), (void**)&scrollingView);
if (NS_SUCCEEDED(result)) {
nscoord xoff = 0;
nscoord yoff = 0;
scrollingView->GetScrollPosition(xoff, yoff);
isHorizontal ? start += xoff : start += yoff;
}
}
nsRect r;
parent->GetRect(r);
isHorizontal ? start -= r.x : start -= r.y;
if (view) {
nsIWidget* widget = nsnull;
view->GetWidget(widget);
if (widget) {
nsWindowType windowType;
widget->GetWindowType(windowType);
if (windowType == eWindowType_popup)
break;
}
}
parent->GetParent(&parent);
}