diff --git a/mozilla/layout/generic/nsFrameSetFrame.cpp b/mozilla/layout/generic/nsFrameSetFrame.cpp index 1739e18911f..aedbb59d08e 100644 --- a/mozilla/layout/generic/nsFrameSetFrame.cpp +++ b/mozilla/layout/generic/nsFrameSetFrame.cpp @@ -457,16 +457,20 @@ NS_METHOD nsHTMLFramesetFrame::HandleEvent(nsIPresContext& aPresContext, nsGUIEvent* aEvent, nsEventStatus& aEventStatus) { - // the nsFramesetBorderFrame has captured NS_MOUSE_DOWN - switch (aEvent->message) { - case NS_MOUSE_MOVE: - MouseDrag(aPresContext, aEvent); - break; - case NS_MOUSE_LEFT_BUTTON_UP: - EndMouseDrag(); - break; + if (mDragger) { + // the nsFramesetBorderFrame has captured NS_MOUSE_DOWN + switch (aEvent->message) { + case NS_MOUSE_MOVE: + MouseDrag(aPresContext, aEvent); + break; + case NS_MOUSE_LEFT_BUTTON_UP: + EndMouseDrag(); + break; + } + aEventStatus = nsEventStatus_eConsumeNoDefault; + } else { + aEventStatus = nsEventStatus_eIgnore; } - aEventStatus = nsEventStatus_eConsumeNoDefault; return NS_OK; } diff --git a/mozilla/layout/html/document/src/nsFrameSetFrame.cpp b/mozilla/layout/html/document/src/nsFrameSetFrame.cpp index 1739e18911f..aedbb59d08e 100644 --- a/mozilla/layout/html/document/src/nsFrameSetFrame.cpp +++ b/mozilla/layout/html/document/src/nsFrameSetFrame.cpp @@ -457,16 +457,20 @@ NS_METHOD nsHTMLFramesetFrame::HandleEvent(nsIPresContext& aPresContext, nsGUIEvent* aEvent, nsEventStatus& aEventStatus) { - // the nsFramesetBorderFrame has captured NS_MOUSE_DOWN - switch (aEvent->message) { - case NS_MOUSE_MOVE: - MouseDrag(aPresContext, aEvent); - break; - case NS_MOUSE_LEFT_BUTTON_UP: - EndMouseDrag(); - break; + if (mDragger) { + // the nsFramesetBorderFrame has captured NS_MOUSE_DOWN + switch (aEvent->message) { + case NS_MOUSE_MOVE: + MouseDrag(aPresContext, aEvent); + break; + case NS_MOUSE_LEFT_BUTTON_UP: + EndMouseDrag(); + break; + } + aEventStatus = nsEventStatus_eConsumeNoDefault; + } else { + aEventStatus = nsEventStatus_eIgnore; } - aEventStatus = nsEventStatus_eConsumeNoDefault; return NS_OK; }