Changeset 54083 in webkit

Timestamp:

Jan 29, 2010 4:00:01 PM (14 years ago)

Author:

bweinstein@apple.com

Message:

WebCore: Drag and Drop: Windows uses "stop" sign as cursor when dragging
​https://bugs.webkit.org/show_bug.cgi?id=34305
<rdar://problem/7589672>

Reviewed by Adam Roben.

Add a FIXME for the code that needs to be changed to support full
custom cursors.

• page/EventHandler.cpp:

(WebCore::EventHandler::handleDrag):

WebKit/win: Drag and Drop: Windows uses "stop" sign as cursor when dragging
​https://bugs.webkit.org/show_bug.cgi?id=34305
<rdar://problem/7589672>

Reviewed by Adam Roben.

Add a preference in WebKit (that defaults to false), for whether or not
we should show the custom cursors during drag and drop. However, this is
currently only used on Windows, and only used to hide the "drop not allowed"
icon inside the WebView is the preference is set to true.

This will be off by default, so no change in behavior.

• Interfaces/IWebPreferencesPrivate.idl: Added new functions.
• Interfaces/WebKit.idl: Touched to force Interfaces build.
• WebDropSource.cpp:

(WebDropSource::GiveFeedback): Implementation of conditional showing cursor

logic.

• WebPreferenceKeysPrivate.h: Added new preference key.
• WebPreferences.cpp: Added new functions.

(WebPreferences::setCustomDragCursorsEnabled):
(WebPreferences::customDragCursorsEnabled):

• WebPreferences.h: Added new functions.

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/EventHandler.cpp (modified) (1 diff)
• WebKit/win/ChangeLog (modified) (1 diff)
• WebKit/win/Interfaces/IWebPreferencesPrivate.idl (modified) (1 diff)
• WebKit/win/Interfaces/WebKit.idl (modified) (1 diff)
• WebKit/win/WebDropSource.cpp (modified) (2 diffs)
• WebKit/win/WebPreferenceKeysPrivate.h (modified) (1 diff)
• WebKit/win/WebPreferences.cpp (modified) (1 diff)
• WebKit/win/WebPreferences.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-29  Brian Weinstein  <bweinstein@apple.com>
+
+        Reviewed by Adam Roben.
+
+        Drag and Drop: Windows uses "stop" sign as cursor when dragging
+        https://bugs.webkit.org/show_bug.cgi?id=34305
+        <rdar://problem/7589672>
+
+        Add a FIXME for the code that needs to be changed to support full
+        custom cursors.
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::handleDrag):
+
 2010-01-29  Victor Wang  <victorw@chromium.org>
 

trunk/WebCore/page/EventHandler.cpp

@@ -2293 +2293 @@
     
     // We are starting a text/image/url drag, so the cursor should be an arrow
-    if (FrameView* view = m_frame->view())
+    if (FrameView* view = m_frame->view()) {
+        // FIXME <rdar://7577595>: Custom cursors aren't supported during drag and drop (default to pointer).
         view->setCursor(pointerCursor());
-    
+    }
+
     if (!dragHysteresisExceeded(event.event().pos())) 
         return true;

trunk/WebKit/win/ChangeLog

@@ +1 @@
+2010-01-29  Brian Weinstein  <bweinstein@apple.com>
+
+        Reviewed by Adam Roben.
+
+        Drag and Drop: Windows uses "stop" sign as cursor when dragging
+        https://bugs.webkit.org/show_bug.cgi?id=34305
+        <rdar://problem/7589672>
+        
+        Add a preference in WebKit (that defaults to false), for whether or not
+        we should show the custom cursors during drag and drop. However, this is
+        currently only used on Windows, and only used to hide the "drop not allowed"
+        icon inside the WebView is the preference is set to true.
+
+        This will be off by default, so no change in behavior.
+
+        * Interfaces/IWebPreferencesPrivate.idl: Added new functions.
+        * Interfaces/WebKit.idl: Touched to force Interfaces build.
+        * WebDropSource.cpp:
+        (WebDropSource::GiveFeedback): Implementation of conditional showing cursor
+            logic.
+        * WebPreferenceKeysPrivate.h: Added new preference key.
+        * WebPreferences.cpp: Added new functions.
+        (WebPreferences::setCustomDragCursorsEnabled):
+        (WebPreferences::customDragCursorsEnabled):
+        * WebPreferences.h: Added new functions.
+
 2010-01-28  Jon Honeycutt  <jhoneycutt@apple.com>
 

trunk/WebKit/win/Interfaces/IWebPreferencesPrivate.idl

@@ -95 +95 @@
     HRESULT setAcceleratedCompositingEnabled([in] BOOL);
     HRESULT acceleratedCompositingEnabled([out, retval] BOOL*);
+
+    HRESULT setCustomDragCursorsEnabled([in] BOOL);
+    HRESULT customDragCursorsEnabled([out, retval] BOOL*);
 }

trunk/WebKit/win/Interfaces/WebKit.idl

@@ -295 +295 @@
     }
 }
+

trunk/WebKit/win/WebDropSource.cpp

@@ -30 +30 @@
 #include "WebView.h"
 
+#include <WebCore/Cursor.h>
 #include <WebCore/DragActions.h>
 #include <WebCore/EventHandler.h>
 #include <WebCore/Frame.h>
+#include <WebCore/FrameView.h>
 #include <WebCore/Page.h>
 #include <WebCore/PlatformMouseEvent.h>
@@ -113 +115 @@
 }
 
-STDMETHODIMP WebDropSource::GiveFeedback(DWORD)
+STDMETHODIMP WebDropSource::GiveFeedback(DWORD dwEffect)
 {
-    return DRAGDROP_S_USEDEFAULTCURSORS;
+    BOOL showCustomCursors;
+    if (FAILED(WebPreferences::sharedStandardPreferences()->customDragCursorsEnabled(&showCustomCursors)))
+        return DRAGDROP_S_USEDEFAULTCURSORS;
+
+    // If we don't want to hide the stop icon, let Windows select the cursor.
+    if (!showCustomCursors)
+        return DRAGDROP_S_USEDEFAULTCURSORS;
+
+    // If we are going to show something other than the not allowed arrow, then let Windows
+    // show the cursor.
+    if (dwEffect != DROPEFFECT_NONE)
+        return DRAGDROP_S_USEDEFAULTCURSORS;
+    
+    HWND viewWindow;
+    if (FAILED(m_webView->viewWindow(reinterpret_cast<OLE_HANDLE*>(&viewWindow))))
+        return DRAGDROP_S_USEDEFAULTCURSORS;
+
+    RECT webViewRect;
+    GetWindowRect(viewWindow, &webViewRect);
+
+    POINT cursorPoint;
+    GetCursorPos(&cursorPoint);
+
+    if (!PtInRect(&webViewRect, cursorPoint)) {
+        // If our cursor is outside the bounds of the webView, we want to let Windows select the cursor.
+        return DRAGDROP_S_USEDEFAULTCURSORS;
+    }
+
+    FrameView* view = m_webView->page()->mainFrame()->view();
+    if (!view)
+        return DRAGDROP_S_USEDEFAULTCURSORS;
+
+    // When dragging inside a WebView and the drag is not allowed, don't show the not allowed icon,
+    // instead, show the pointer cursor.   
+    // FIXME <rdar://7577595>: Custom cursors aren't supported during drag and drop (default to pointer).
+    view->setCursor(pointerCursor()); 
+    return S_OK;
 }

trunk/WebKit/win/WebPreferenceKeysPrivate.h

@@ -132 +132 @@
 
 #define WebKitAcceleratedCompositingEnabledPreferenceKey "WebKitAcceleratedCompositingEnabled"
+
+#define WebKitCustomDragCursorsEnabledPreferenceKey "WebKitCustomDragCursorsEnabled"

trunk/WebKit/win/WebPreferences.cpp

@@ -1375 +1375 @@
 }
 
+HRESULT WebPreferences::setCustomDragCursorsEnabled(BOOL enabled)
+{
+    setBoolValue(CFSTR(WebKitCustomDragCursorsEnabledPreferenceKey), enabled);
+    return S_OK;
+}
+
+HRESULT WebPreferences::customDragCursorsEnabled(BOOL* enabled)
+{
+    *enabled = boolValueForKey(CFSTR(WebKitCustomDragCursorsEnabledPreferenceKey));
+    return S_OK;
+}
+
 void WebPreferences::willAddToWebView()
 {

trunk/WebKit/win/WebPreferences.h

@@ -388 +388 @@
     virtual HRESULT STDMETHODCALLTYPE acceleratedCompositingEnabled(BOOL*);
 
+    virtual HRESULT STDMETHODCALLTYPE setCustomDragCursorsEnabled(BOOL);
+    virtual HRESULT STDMETHODCALLTYPE customDragCursorsEnabled(BOOL*);
+
     // WebPreferences