Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-25 20:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix cursor bug which caused cursor to be set once per child view on each mousemove

Browse Source
This commit is contained in:
joki%netscape.com 1998-12-03 03:07:16 +00:00
parent fff8fe4b1e
commit 946548a531
4 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,7 +81,7 @@ nsEventStateManager::PreHandleEvent(nsIPresContext& aPresContext,
switch (aEvent->message) {
case NS_MOUSE_MOVE:
UpdateCursor(aPresContext, aEvent->point, aTargetFrame);
UpdateCursor(aPresContext, aEvent->point, aTargetFrame, aStatus);
GenerateMouseEnterExit(aPresContext, aEvent);
break;
case NS_MOUSE_EXIT:
@ -162,7 +162,8 @@ nsEventStateManager::ClearFrameRefs(nsIFrame* aFrame)
}
void
nsEventStateManager::UpdateCursor(nsIPresContext& aPresContext, nsPoint& aPoint, nsIFrame* aTargetFrame)
nsEventStateManager::UpdateCursor(nsIPresContext& aPresContext, nsPoint& aPoint, nsIFrame* aTargetFrame,
nsEventStatus& aStatus)
{
PRInt32 cursor;
nsCursor c;
@ -202,6 +203,11 @@ nsEventStateManager::UpdateCursor(nsIPresContext& aPresContext, nsPoint& aPoint,
c = eCursor_select;
break;
}
if (NS_STYLE_CURSOR_AUTO != cursor) {
aStatus = nsEventStatus_eConsumeDoDefault;
}
nsIWidget* window;
aTargetFrame->GetWindow(window);
window->SetCursor(c);

2
content/events/src/nsEventStateManager.h
View File

@ -55,7 +55,7 @@ public:
protected:
void UpdateCursor(nsIPresContext& aPresContext, nsPoint& aPoint, nsIFrame* aTargetFrame);
void UpdateCursor(nsIPresContext& aPresContext, nsPoint& aPoint, nsIFrame* aTargetFrame, nsEventStatus& aStatus);
void GenerateMouseEnterExit(nsIPresContext& aPresContext, nsGUIEvent* aEvent);
NS_IMETHOD DispatchKeyPressEvent(nsIPresContext& aPresContext, nsKeyEvent *aEvent, nsEventStatus& aStatus);
NS_IMETHOD CheckForAndDispatchClick(nsIPresContext& aPresContext, nsMouseEvent *aEvent, nsEventStatus& aStatus);

10
layout/events/src/nsEventStateManager.cpp
View File

@ -81,7 +81,7 @@ nsEventStateManager::PreHandleEvent(nsIPresContext& aPresContext,
switch (aEvent->message) {
case NS_MOUSE_MOVE:
UpdateCursor(aPresContext, aEvent->point, aTargetFrame);
UpdateCursor(aPresContext, aEvent->point, aTargetFrame, aStatus);
GenerateMouseEnterExit(aPresContext, aEvent);
break;
case NS_MOUSE_EXIT:
@ -162,7 +162,8 @@ nsEventStateManager::ClearFrameRefs(nsIFrame* aFrame)
}
void
nsEventStateManager::UpdateCursor(nsIPresContext& aPresContext, nsPoint& aPoint, nsIFrame* aTargetFrame)
nsEventStateManager::UpdateCursor(nsIPresContext& aPresContext, nsPoint& aPoint, nsIFrame* aTargetFrame,
nsEventStatus& aStatus)
{
PRInt32 cursor;
nsCursor c;
@ -202,6 +203,11 @@ nsEventStateManager::UpdateCursor(nsIPresContext& aPresContext, nsPoint& aPoint,
c = eCursor_select;
break;
}
if (NS_STYLE_CURSOR_AUTO != cursor) {
aStatus = nsEventStatus_eConsumeDoDefault;
}
nsIWidget* window;
aTargetFrame->GetWindow(window);
window->SetCursor(c);

2
layout/events/src/nsEventStateManager.h
View File

@ -55,7 +55,7 @@ public:
protected:
void UpdateCursor(nsIPresContext& aPresContext, nsPoint& aPoint, nsIFrame* aTargetFrame);
void UpdateCursor(nsIPresContext& aPresContext, nsPoint& aPoint, nsIFrame* aTargetFrame, nsEventStatus& aStatus);
void GenerateMouseEnterExit(nsIPresContext& aPresContext, nsGUIEvent* aEvent);
NS_IMETHOD DispatchKeyPressEvent(nsIPresContext& aPresContext, nsKeyEvent *aEvent, nsEventStatus& aStatus);
NS_IMETHOD CheckForAndDispatchClick(nsIPresContext& aPresContext, nsMouseEvent *aEvent, nsEventStatus& aStatus);