Skip to content

Commit 1e51b84

Browse files
joaompnevesjoaompneves
authored
Merge 9b93a98 into 8ffd29f 
2 parents 8ffd29f + 9b93a98 commit 1e51b84

File tree

12 files changed

+243
-63
lines changed

12 files changed

+243
-63
lines changed

‎CefSharp.Example/CefExample.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public static class CefExample
2424
public const string BasicSchemeTestUrl = BaseUrl + "/SchemeTest.html";
2525
public const string ResponseFilterTestUrl = BaseUrl + "/ResponseFilterTest.html";
2626
public const string DraggableRegionTestUrl = BaseUrl + "/DraggableRegionTest.html";
27+
public const string DragDropCursorsTestUrl = BaseUrl + "/DragDropCursorsTest.html";
2728
public const string CssAnimationTestUrl = BaseUrl + "/CssAnimationTest.html";
2829
public const string CdmSupportTestUrl = BaseUrl + "/CdmSupportTest.html";
2930
public const string TestResourceUrl = "http://test/resource/load";

‎CefSharp.Example/CefSharp.Example.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@
152152
<None Include="Resources\assets\js\shBrushJScript.js" />
153153
<Content Include="Resources\assets\js\shCore.js" />
154154
<Content Include="Resources\BindingTestSingle.html" />
155+
<Content Include="Resources\DragDropCursorsTest.html" />
155156
<Content Include="Resources\LegacyBindingTest.html" />
156157
<Content Include="Resources\CdmSupportTest.html" />
157158
<Content Include="Resources\CssAnimation.html" />

‎CefSharp.Example/CefSharpSchemeHandlerFactory.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ static CefSharpSchemeHandlerFactory()
4747
{ "/ScriptedMethodsTest.html", Resources.ScriptedMethodsTest },
4848
{ "/ResponseFilterTest.html", Resources.ResponseFilterTest },
4949
{ "/DraggableRegionTest.html", Resources.DraggableRegionTest },
50+
{ "/DragDropCursorsTest.html", Resources.DragDropCursorsTest },
5051
{ "/CssAnimationTest.html", Resources.CssAnimation },
5152
{ "/CdmSupportTest.html", Resources.CdmSupportTest },
5253
{ "/Recaptcha.html", Resources.Recaptcha },

‎CefSharp.Example/InMemorySchemeAndResourceHandlerFactory.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ static InMemorySchemeAndResourceHandlerFactory()
4545
{ "/PopupTest.html", Resources.PopupTest },
4646
{ "/SchemeTest.html", Resources.SchemeTest },
4747
{ "/TooltipTest.html", Resources.TooltipTest },
48+
{ "/DragDropCursorsTest.html", Resources.DragDropCursorsTest },
4849
{ "/FramedWebGLTest.html", Resources.FramedWebGLTest },
4950
{ "/MultiBindingTest.html", Resources.MultiBindingTest },
5051
{ "/ScriptedMethodsTest.html", Resources.ScriptedMethodsTest },

‎CefSharp.Example/Properties/Resources.Designer.cs‎

Lines changed: 31 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CefSharp.Example/Properties/Resources.resx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,9 @@
133133
<data name="TooltipTest" type="System.Resources.ResXFileRef, System.Windows.Forms">
134134
<value>..\Resources\TooltipTest.html;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
135135
</data>
136+
<data name="DragDropCursorsTest" type="System.Resources.ResXFileRef, System.Windows.Forms">
137+
<value>..\Resources\DragDropCursorsTest.html;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
138+
</data>
136139
<data name="bootstrap_min_css" type="System.Resources.ResXFileRef, System.Windows.Forms">
137140
<value>..\Resources\bootstrap\bootstrap.min.css;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
138141
</data>

‎CefSharp.Example/Resources/DragDropCursorsTest.html‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
2+
<html>
3+
<head>
4+
<title>Drag&Drop Cursors Test</title>
5+
<style>
6+
.dropzone {
7+
width: 80px;
8+
height: 70px;
9+
padding: 10px;
10+
display: inline-block;
11+
border: 1px solid #aaaaaa;
12+
background: white;
13+
}
14+
15+
#drag {
16+
width: 200px;
17+
height: 50px;
18+
padding: 10px;
19+
border: 1px solid #aaaaaa;
20+
background: wheat;
21+
}
22+
</style>
23+
<script>
24+
function allowDrop(ev, effect) {
25+
ev.dataTransfer.dropEffect = effect;
26+
ev.preventDefault();
27+
}
28+
29+
function drag(ev) {
30+
ev.dataTransfer.setData("text", ev.target.id);
31+
}
32+
33+
function drop(ev) {
34+
ev.preventDefault();
35+
var data = ev.dataTransfer.getData("text");
36+
ev.target.appendChild(document.getElementById(data));
37+
}
38+
</script>
39+
</head>
40+
<body>
41+
<div class="dropzone" ondrop="drop(event)" ondragover="allowDrop(event, 'none')">None</div>
42+
<div class="dropzone" ondrop="drop(event)" ondragover="allowDrop(event, 'copy')">Copy</div>
43+
<div class="dropzone" ondrop="drop(event)" ondragover="allowDrop(event, 'move')">Move</div>
44+
<div class="dropzone" ondrop="drop(event)" ondragover="allowDrop(event, 'link')">Link</div>
45+
<br>
46+
<br>
47+
<div id="drag" draggable="true" ondragstart="drag(event)">Drag me over the drop zones</div>
48+
</body>
49+
</html>

‎CefSharp.Wpf.Example/MainWindow.xaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<MenuItem Header="_LegacyBinding Test" Command="controls:CefSharpCommands.OpenTabCommand" CommandParameter="{Binding Source={x:Static ex:CefExample.LegacyBindingTestUrl}}"/>
3030
<MenuItem Header="_List Plugins" Command="controls:CefSharpCommands.OpenTabCommand" CommandParameter="{Binding Source={x:Static ex:CefExample.PluginsTestUrl}}"/>
3131
<MenuItem Header="_Tooltip Test" Command="controls:CefSharpCommands.OpenTabCommand" CommandParameter="{Binding Source={x:Static ex:CefExample.TooltipTestUrl}}"/>
32+
<MenuItem Header="D_rag&amp;Drop Cursors Test" Command="controls:CefSharpCommands.OpenTabCommand" CommandParameter="{Binding Source={x:Static ex:CefExample.DragDropCursorsTestUrl}}"/>
3233
<MenuItem Header="_Popup Test" Command="controls:CefSharpCommands.OpenTabCommand" CommandParameter="{Binding Source={x:Static ex:CefExample.PopupParentUrl}}"/>
3334
<MenuItem Header="_Popup Test Custom Scheme" Command="controls:CefSharpCommands.OpenTabCommand" CommandParameter="{Binding Source={x:Static ex:CefExample.PopupTestUrl}}"/>
3435
<MenuItem Header="_Basic Scheme Test" Command="controls:CefSharpCommands.OpenTabCommand" CommandParameter="{Binding Source={x:Static ex:CefExample.BasicSchemeTestUrl}}"/>

‎CefSharp.Wpf/CefSharp.Wpf.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@
7979
</ItemGroup>
8080
<ItemGroup>
8181
<Compile Include="CefSettings.cs" />
82+
<Compile Include="Internals\DragCursorProvider.cs" />
83+
<Compile Include="Internals\DragOperationMaskExtensions.cs" />
8284
<Compile Include="Internals\MonitorInfo.cs" />
8385
<Compile Include="Internals\MonitorInfoEx.cs" />
8486
<Compile Include="Internals\RectStruct.cs" />

‎CefSharp.Wpf/ChromiumWebBrowser.cs‎

Lines changed: 20 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,7 @@ private void NoInliningConstructor()
489489
DragOver += OnDragOver;
490490
DragLeave += OnDragLeave;
491491
Drop += OnDrop;
492+
GiveFeedback += OnGiveFeedback;
492493

493494
IsVisibleChanged += OnIsVisibleChanged;
494495

@@ -610,6 +611,7 @@ protected virtual void Dispose(bool isDisposing)
610611
DragOver -= OnDragOver;
611612
DragLeave -= OnDragLeave;
612613
Drop -= OnDrop;
614+
GiveFeedback -= OnGiveFeedback;
613615

614616
IsVisibleChanged -= OnIsVisibleChanged;
615617

@@ -761,14 +763,14 @@ bool IRenderWebBrowser.StartDragging(IDragData dragData, DragOperationsMask allo
761763
if (browser != null)
762764
{
763765
//DoDragDrop will fire DragEnter event
764-
var result = DragDrop.DoDragDrop(this, dataObject, GetDragEffects(allowedOps));
766+
var result = DragDrop.DoDragDrop(this, dataObject, allowedOps.GetDragEffects());
765767

766768
//DragData was stored so when DoDragDrop fires DragEnter we reuse a clone of the IDragData provided here
767769
currentDragData = null;
768770

769771
//If result == DragDropEffects.None then we'll send DragOperationsMask.None
770772
//effectively cancelling the drag operation
771-
browser.GetHost().DragSourceEndedAt(x, y, GetDragOperationsMask(result));
773+
browser.GetHost().DragSourceEndedAt(x, y, result.GetDragOperationsMask());
772774
browser.GetHost().DragSourceSystemDragEnded();
773775
}
774776
});
@@ -787,7 +789,8 @@ void IRenderWebBrowser.UpdateDragCursor(DragOperationsMask operation)
787789
/// <param name="operation">describes the allowed operation (none, move, copy, link). </param>
788790
protected virtual void UpdateDragCursor(DragOperationsMask operation)
789791
{
790-
//TODO: Someone should implement this
792+
var dragCursor = DragCursorProvider.GetCursor(operation);
793+
UiThreadRunAsync(() => Mouse.SetCursor(dragCursor));
791794
}
792795

793796
/// <summary>
@@ -1498,7 +1501,7 @@ private void OnDrop(object sender, DragEventArgs e)
14981501
if (browser != null)
14991502
{
15001503
var mouseEvent = GetMouseEvent(e);
1501-
var effect = GetDragOperationsMask(e.AllowedEffects);
1504+
var effect = e.AllowedEffects.GetDragOperationsMask();
15021505

15031506
browser.GetHost().DragTargetDragOver(mouseEvent, effect);
15041507
browser.GetHost().DragTargetDragDrop(mouseEvent);
@@ -1527,10 +1530,21 @@ private void OnDragOver(object sender, DragEventArgs e)
15271530
{
15281531
if (browser != null)
15291532
{
1530-
browser.GetHost().DragTargetDragOver(GetMouseEvent(e), GetDragOperationsMask(e.AllowedEffects));
1533+
browser.GetHost().DragTargetDragOver(GetMouseEvent(e), e.AllowedEffects.GetDragOperationsMask());
15311534
}
15321535
}
15331536

1537+
/// <summary>
1538+
/// Handles the <see cref="E:GiveFeedback" /> event.
1539+
/// </summary>
1540+
/// <param name="sender">The sender.</param>
1541+
/// <param name="e">The <see cref="GiveFeedbackEventArgs"/> instance containing the event data.</param>
1542+
private void OnGiveFeedback(object sender, GiveFeedbackEventArgs e)
1543+
{
1544+
/// prevent showing default cursor, the appropriate cursor will be set by <see cref=UpdateDragCursor />
1545+
e.Handled = true;
1546+
}
1547+
15341548
/// <summary>
15351549
/// Handles the <see cref="E:DragEnter" /> event.
15361550
/// </summary>
@@ -1541,7 +1555,7 @@ private void OnDragEnter(object sender, DragEventArgs e)
15411555
if (browser != null)
15421556
{
15431557
var mouseEvent = GetMouseEvent(e);
1544-
var effect = GetDragOperationsMask(e.AllowedEffects);
1558+
var effect = e.AllowedEffects.GetDragOperationsMask();
15451559

15461560
//DoDragDrop will fire this handler for internally sourced Drag/Drop operations
15471561
//we use the existing IDragData (cloned copy)
@@ -1552,62 +1566,6 @@ private void OnDragEnter(object sender, DragEventArgs e)
15521566
}
15531567
}
15541568

1555-
/// <summary>
1556-
/// Converts .NET drag drop effects to CEF Drag Operations
1557-
/// </summary>
1558-
/// <param name="dragDropEffects">The drag drop effects.</param>
1559-
/// <returns>DragOperationsMask.</returns>
1560-
/// s
1561-
private static DragOperationsMask GetDragOperationsMask(DragDropEffects dragDropEffects)
1562-
{
1563-
var operations = DragOperationsMask.None;
1564-
1565-
if (dragDropEffects.HasFlag(DragDropEffects.All))
1566-
{
1567-
operations |= DragOperationsMask.Every;
1568-
}
1569-
if (dragDropEffects.HasFlag(DragDropEffects.Copy))
1570-
{
1571-
operations |= DragOperationsMask.Copy;
1572-
}
1573-
if (dragDropEffects.HasFlag(DragDropEffects.Move))
1574-
{
1575-
operations |= DragOperationsMask.Move;
1576-
}
1577-
if (dragDropEffects.HasFlag(DragDropEffects.Link))
1578-
{
1579-
operations |= DragOperationsMask.Link;
1580-
}
1581-
1582-
return operations;
1583-
}
1584-
1585-
/// <summary>
1586-
/// Gets the drag effects.
1587-
/// </summary>
1588-
/// <param name="mask">The mask.</param>
1589-
/// <returns>DragDropEffects.</returns>
1590-
private static DragDropEffects GetDragEffects(DragOperationsMask mask)
1591-
{
1592-
if ((mask & DragOperationsMask.Every) == DragOperationsMask.Every)
1593-
{
1594-
return DragDropEffects.All;
1595-
}
1596-
if ((mask & DragOperationsMask.Copy) == DragOperationsMask.Copy)
1597-
{
1598-
return DragDropEffects.Copy;
1599-
}
1600-
if ((mask & DragOperationsMask.Move) == DragOperationsMask.Move)
1601-
{
1602-
return DragDropEffects.Move;
1603-
}
1604-
if ((mask & DragOperationsMask.Link) == DragOperationsMask.Link)
1605-
{
1606-
return DragDropEffects.Link;
1607-
}
1608-
return DragDropEffects.None;
1609-
}
1610-
16111569
/// <summary>
16121570
/// PresentationSource changed handler.
16131571
/// </summary>

0 commit comments

Comments
 (0)