From cdb5c9c60b4c3759f89ad5c3942c46bb39cdf03d Mon Sep 17 00:00:00 2001 From: "mitz@apple.com" Date: Mon, 24 Jan 2011 17:54:10 +0000 Subject: [PATCH] WebKit2 version of Mail's cursor does not become a resize cursor when moving mouse from scrolled email to the horizontal splitter Reviewed by John Sullivan. * UIProcess/API/mac/PageClientImpl.mm: (WebKit::PageClientImpl::setCursor): If the current cursor comes from a cursor rect, do not override it. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@76529 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebKit2/ChangeLog | 9 +++++++++ Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm | 7 ++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog index 60ab104f..f1d02dbe 100644 --- a/Source/WebKit2/ChangeLog +++ b/Source/WebKit2/ChangeLog @@ -1,3 +1,12 @@ +2011-01-24 Dan Bernstein + + Reviewed by John Sullivan. + + WebKit2 version of Mail's cursor does not become a resize cursor when moving mouse from scrolled email to the horizontal splitter + + * UIProcess/API/mac/PageClientImpl.mm: + (WebKit::PageClientImpl::setCursor): If the current cursor comes from a cursor rect, do not override it. + 2011-01-24 Balazs Kelemen Rubber-stamped by Csaba Osztrogonác. diff --git a/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm b/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm index 60be5bc..6eab7f6 100644 --- a/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm +++ b/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm @@ -43,6 +43,10 @@ #import #import +@interface NSApplication (WebNSApplicationDetails) +- (NSCursor *)_cursorRectCursor; +@end + using namespace WebCore; @interface WebEditCommandObjC : NSObject @@ -195,7 +199,8 @@ void PageClientImpl::toolTipChanged(const String& oldToolTip, const String& newT void PageClientImpl::setCursor(const WebCore::Cursor& cursor) { - [m_wkView _setCursor:cursor.platformCursor()]; + if (![NSApp _cursorRectCursor]) + [m_wkView _setCursor:cursor.platformCursor()]; } void PageClientImpl::setViewportArguments(const WebCore::ViewportArguments&) -- 1.8.3.1