Commit a78d2f2f authored by mitz@apple.com's avatar mitz@apple.com
Browse files

WebKit2 version of <rdar://problem/6097826> Mail's cursor does not become a...

WebKit2 version of <rdar://problem/6097826> 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: http://svn.webkit.org/repository/webkit/trunk@76529 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent b38a60bc
2011-01-24 Dan Bernstein <mitz@apple.com>
Reviewed by John Sullivan.
WebKit2 version of <rdar://problem/6097826> 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 <kbalazs@webkit.org>
 
Rubber-stamped by Csaba Osztrogonác.
......@@ -43,6 +43,10 @@
#import <wtf/text/CString.h>
#import <wtf/text/WTFString.h>
@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&)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment