From 68f5cd6dd62ccc56735857583a87a788eec4fd12 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Wed, 18 Apr 2018 01:06:44 +0200 Subject: [PATCH] Move DnD classes to Avalonia.Input. Fixes #1506. --- samples/ControlCatalog/Pages/DragAndDropPage.xaml.cs | 2 +- src/Avalonia.Controls/Application.cs | 9 +++------ src/Avalonia.Controls/Platform/InProcessDragSource.cs | 2 -- src/Avalonia.Input/{DragDrop => }/DataFormats.cs | 2 +- src/Avalonia.Input/{DragDrop => }/DataObject.cs | 2 +- src/Avalonia.Input/{DragDrop => }/DragDrop.cs | 2 +- src/Avalonia.Input/{DragDrop => }/DragDropDevice.cs | 3 +-- src/Avalonia.Input/{DragDrop => }/DragDropEffects.cs | 2 +- src/Avalonia.Input/{DragDrop => }/DragEventArgs.cs | 2 +- src/Avalonia.Input/{DragDrop => }/IDataObject.cs | 2 +- src/Avalonia.Input/Platform/IPlatformDragSource.cs | 2 +- src/Avalonia.Input/{DragDrop => }/Raw/IDragDropDevice.cs | 2 +- src/Avalonia.Input/{DragDrop => }/Raw/RawDragEvent.cs | 2 +- .../{DragDrop => }/Raw/RawDragEventType.cs | 2 +- src/OSX/Avalonia.MonoMac/DragSource.cs | 3 +-- src/OSX/Avalonia.MonoMac/DraggingInfo.cs | 2 +- src/OSX/Avalonia.MonoMac/TopLevelImpl.cs | 2 -- src/Windows/Avalonia.Win32/ClipboardFormats.cs | 2 +- src/Windows/Avalonia.Win32/DataObject.cs | 4 ++-- src/Windows/Avalonia.Win32/DragSource.cs | 2 +- src/Windows/Avalonia.Win32/OleDataObject.cs | 4 ++-- src/Windows/Avalonia.Win32/OleDropTarget.cs | 7 +++---- 22 files changed, 26 insertions(+), 36 deletions(-) rename src/Avalonia.Input/{DragDrop => }/DataFormats.cs (89%) rename src/Avalonia.Input/{DragDrop => }/DataObject.cs (96%) rename src/Avalonia.Input/{DragDrop => }/DragDrop.cs (98%) rename src/Avalonia.Input/{DragDrop => }/DragDropDevice.cs (98%) rename src/Avalonia.Input/{DragDrop => }/DragDropEffects.cs (80%) rename src/Avalonia.Input/{DragDrop => }/DragEventArgs.cs (91%) rename src/Avalonia.Input/{DragDrop => }/IDataObject.cs (97%) rename src/Avalonia.Input/{DragDrop => }/Raw/IDragDropDevice.cs (70%) rename src/Avalonia.Input/{DragDrop => }/Raw/RawDragEvent.cs (94%) rename src/Avalonia.Input/{DragDrop => }/Raw/RawDragEventType.cs (73%) diff --git a/samples/ControlCatalog/Pages/DragAndDropPage.xaml.cs b/samples/ControlCatalog/Pages/DragAndDropPage.xaml.cs index 172331204f..718f21314e 100644 --- a/samples/ControlCatalog/Pages/DragAndDropPage.xaml.cs +++ b/samples/ControlCatalog/Pages/DragAndDropPage.xaml.cs @@ -1,5 +1,5 @@ using Avalonia.Controls; -using Avalonia.Input.DragDrop; +using Avalonia.Input; using Avalonia.Markup.Xaml; using System; using System.Collections.Generic; diff --git a/src/Avalonia.Controls/Application.cs b/src/Avalonia.Controls/Application.cs index 3dc07f81e6..6fdca557eb 100644 --- a/src/Avalonia.Controls/Application.cs +++ b/src/Avalonia.Controls/Application.cs @@ -2,20 +2,17 @@ // Licensed under the MIT license. See licence.md file in the project root for full license information. using System; +using System.Reactive.Concurrency; using System.Threading; using Avalonia.Controls; using Avalonia.Controls.Templates; using Avalonia.Input; using Avalonia.Input.Platform; +using Avalonia.Input.Raw; using Avalonia.Layout; -using Avalonia.Rendering; +using Avalonia.Platform; using Avalonia.Styling; using Avalonia.Threading; -using System.Reactive.Concurrency; -using Avalonia.Input.DragDrop.Raw; -using Avalonia.Controls.Platform; -using Avalonia.Platform; -using Avalonia.Input.DragDrop; namespace Avalonia { diff --git a/src/Avalonia.Controls/Platform/InProcessDragSource.cs b/src/Avalonia.Controls/Platform/InProcessDragSource.cs index 1e97c7bf96..e136efe2a9 100644 --- a/src/Avalonia.Controls/Platform/InProcessDragSource.cs +++ b/src/Avalonia.Controls/Platform/InProcessDragSource.cs @@ -5,8 +5,6 @@ using System.Reactive.Subjects; using System.Threading.Tasks; using Avalonia.Controls; using Avalonia.Input; -using Avalonia.Input.DragDrop; -using Avalonia.Input.DragDrop.Raw; using Avalonia.Input.Platform; using Avalonia.Input.Raw; using Avalonia.Threading; diff --git a/src/Avalonia.Input/DragDrop/DataFormats.cs b/src/Avalonia.Input/DataFormats.cs similarity index 89% rename from src/Avalonia.Input/DragDrop/DataFormats.cs rename to src/Avalonia.Input/DataFormats.cs index 4115701478..559d2cb643 100644 --- a/src/Avalonia.Input/DragDrop/DataFormats.cs +++ b/src/Avalonia.Input/DataFormats.cs @@ -1,4 +1,4 @@ -namespace Avalonia.Input.DragDrop +namespace Avalonia.Input { public static class DataFormats { diff --git a/src/Avalonia.Input/DragDrop/DataObject.cs b/src/Avalonia.Input/DataObject.cs similarity index 96% rename from src/Avalonia.Input/DragDrop/DataObject.cs rename to src/Avalonia.Input/DataObject.cs index 0db1008a6c..cb642f4d65 100644 --- a/src/Avalonia.Input/DragDrop/DataObject.cs +++ b/src/Avalonia.Input/DataObject.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; -namespace Avalonia.Input.DragDrop +namespace Avalonia.Input { public class DataObject : IDataObject { diff --git a/src/Avalonia.Input/DragDrop/DragDrop.cs b/src/Avalonia.Input/DragDrop.cs similarity index 98% rename from src/Avalonia.Input/DragDrop/DragDrop.cs rename to src/Avalonia.Input/DragDrop.cs index 0cbbfb1dbe..c312732afa 100644 --- a/src/Avalonia.Input/DragDrop/DragDrop.cs +++ b/src/Avalonia.Input/DragDrop.cs @@ -2,7 +2,7 @@ using Avalonia.Interactivity; using Avalonia.Input.Platform; -namespace Avalonia.Input.DragDrop +namespace Avalonia.Input { public static class DragDrop { diff --git a/src/Avalonia.Input/DragDrop/DragDropDevice.cs b/src/Avalonia.Input/DragDropDevice.cs similarity index 98% rename from src/Avalonia.Input/DragDrop/DragDropDevice.cs rename to src/Avalonia.Input/DragDropDevice.cs index 7ef6f212f8..2615e3a212 100644 --- a/src/Avalonia.Input/DragDrop/DragDropDevice.cs +++ b/src/Avalonia.Input/DragDropDevice.cs @@ -1,10 +1,9 @@ using Avalonia.Interactivity; using Avalonia.VisualTree; using System.Linq; -using Avalonia.Input.DragDrop.Raw; using Avalonia.Input.Raw; -namespace Avalonia.Input.DragDrop +namespace Avalonia.Input { public class DragDropDevice : IDragDropDevice { diff --git a/src/Avalonia.Input/DragDrop/DragDropEffects.cs b/src/Avalonia.Input/DragDropEffects.cs similarity index 80% rename from src/Avalonia.Input/DragDrop/DragDropEffects.cs rename to src/Avalonia.Input/DragDropEffects.cs index 7f093bc89c..bcda1091d5 100644 --- a/src/Avalonia.Input/DragDrop/DragDropEffects.cs +++ b/src/Avalonia.Input/DragDropEffects.cs @@ -1,6 +1,6 @@ using System; -namespace Avalonia.Input.DragDrop +namespace Avalonia.Input { [Flags] public enum DragDropEffects diff --git a/src/Avalonia.Input/DragDrop/DragEventArgs.cs b/src/Avalonia.Input/DragEventArgs.cs similarity index 91% rename from src/Avalonia.Input/DragDrop/DragEventArgs.cs rename to src/Avalonia.Input/DragEventArgs.cs index bff19c760c..12d5a8941e 100644 --- a/src/Avalonia.Input/DragDrop/DragEventArgs.cs +++ b/src/Avalonia.Input/DragEventArgs.cs @@ -1,6 +1,6 @@ using Avalonia.Interactivity; -namespace Avalonia.Input.DragDrop +namespace Avalonia.Input { public class DragEventArgs : RoutedEventArgs { diff --git a/src/Avalonia.Input/DragDrop/IDataObject.cs b/src/Avalonia.Input/IDataObject.cs similarity index 97% rename from src/Avalonia.Input/DragDrop/IDataObject.cs rename to src/Avalonia.Input/IDataObject.cs index bf2d00f529..1b12323d99 100644 --- a/src/Avalonia.Input/DragDrop/IDataObject.cs +++ b/src/Avalonia.Input/IDataObject.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Avalonia.Input.DragDrop +namespace Avalonia.Input { /// /// Interface to access information about the data of a drag-and-drop operation. diff --git a/src/Avalonia.Input/Platform/IPlatformDragSource.cs b/src/Avalonia.Input/Platform/IPlatformDragSource.cs index 44b4d30760..669251c50b 100644 --- a/src/Avalonia.Input/Platform/IPlatformDragSource.cs +++ b/src/Avalonia.Input/Platform/IPlatformDragSource.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; using System.Threading.Tasks; -using Avalonia.Input.DragDrop; +using Avalonia.Input; using Avalonia.Interactivity; namespace Avalonia.Input.Platform diff --git a/src/Avalonia.Input/DragDrop/Raw/IDragDropDevice.cs b/src/Avalonia.Input/Raw/IDragDropDevice.cs similarity index 70% rename from src/Avalonia.Input/DragDrop/Raw/IDragDropDevice.cs rename to src/Avalonia.Input/Raw/IDragDropDevice.cs index 2022e842ae..6aab1b868d 100644 --- a/src/Avalonia.Input/DragDrop/Raw/IDragDropDevice.cs +++ b/src/Avalonia.Input/Raw/IDragDropDevice.cs @@ -1,6 +1,6 @@ using Avalonia.Input; -namespace Avalonia.Input.DragDrop.Raw +namespace Avalonia.Input.Raw { public interface IDragDropDevice : IInputDevice { diff --git a/src/Avalonia.Input/DragDrop/Raw/RawDragEvent.cs b/src/Avalonia.Input/Raw/RawDragEvent.cs similarity index 94% rename from src/Avalonia.Input/DragDrop/Raw/RawDragEvent.cs rename to src/Avalonia.Input/Raw/RawDragEvent.cs index af18186d4b..49125b4c07 100644 --- a/src/Avalonia.Input/DragDrop/Raw/RawDragEvent.cs +++ b/src/Avalonia.Input/Raw/RawDragEvent.cs @@ -2,7 +2,7 @@ using Avalonia.Input; using Avalonia.Input.Raw; -namespace Avalonia.Input.DragDrop.Raw +namespace Avalonia.Input.Raw { public class RawDragEvent : RawInputEventArgs { diff --git a/src/Avalonia.Input/DragDrop/Raw/RawDragEventType.cs b/src/Avalonia.Input/Raw/RawDragEventType.cs similarity index 73% rename from src/Avalonia.Input/DragDrop/Raw/RawDragEventType.cs rename to src/Avalonia.Input/Raw/RawDragEventType.cs index 31450efb51..9635f77467 100644 --- a/src/Avalonia.Input/DragDrop/Raw/RawDragEventType.cs +++ b/src/Avalonia.Input/Raw/RawDragEventType.cs @@ -1,4 +1,4 @@ -namespace Avalonia.Input.DragDrop.Raw +namespace Avalonia.Input.Raw { public enum RawDragEventType { diff --git a/src/OSX/Avalonia.MonoMac/DragSource.cs b/src/OSX/Avalonia.MonoMac/DragSource.cs index 96d650ab3a..41a206b580 100644 --- a/src/OSX/Avalonia.MonoMac/DragSource.cs +++ b/src/OSX/Avalonia.MonoMac/DragSource.cs @@ -10,9 +10,8 @@ using System.Runtime.InteropServices; using System.Runtime.Serialization.Formatters.Binary; using System.Threading.Tasks; using Avalonia.Controls; -using Avalonia.Input.DragDrop; -using Avalonia.Input.Platform; using Avalonia.Input; +using Avalonia.Input.Platform; using Avalonia.Input.Raw; using MonoMac; using MonoMac.AppKit; diff --git a/src/OSX/Avalonia.MonoMac/DraggingInfo.cs b/src/OSX/Avalonia.MonoMac/DraggingInfo.cs index ca8a24ba82..fc5f52713e 100644 --- a/src/OSX/Avalonia.MonoMac/DraggingInfo.cs +++ b/src/OSX/Avalonia.MonoMac/DraggingInfo.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using Avalonia.Input.DragDrop; +using Avalonia.Input; using MonoMac.AppKit; using MonoMac.Foundation; diff --git a/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs b/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs index 34d0949b57..db7f29f05b 100644 --- a/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs +++ b/src/OSX/Avalonia.MonoMac/TopLevelImpl.cs @@ -1,7 +1,5 @@ using System; using System.Collections.Generic; -using Avalonia.Input.DragDrop; -using Avalonia.Input.DragDrop.Raw; using Avalonia.Input; using Avalonia.Input.Raw; using Avalonia.Platform; diff --git a/src/Windows/Avalonia.Win32/ClipboardFormats.cs b/src/Windows/Avalonia.Win32/ClipboardFormats.cs index a604f634f6..5e0bbab975 100644 --- a/src/Windows/Avalonia.Win32/ClipboardFormats.cs +++ b/src/Windows/Avalonia.Win32/ClipboardFormats.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.Linq; using System.Text; -using Avalonia.Input.DragDrop; +using Avalonia.Input; using Avalonia.Win32.Interop; namespace Avalonia.Win32 diff --git a/src/Windows/Avalonia.Win32/DataObject.cs b/src/Windows/Avalonia.Win32/DataObject.cs index 2a990419e7..34867765e5 100644 --- a/src/Windows/Avalonia.Win32/DataObject.cs +++ b/src/Windows/Avalonia.Win32/DataObject.cs @@ -4,9 +4,9 @@ using System.Collections.Generic; using System.Runtime.InteropServices; using System.Runtime.InteropServices.ComTypes; using System.Text; -using Avalonia.Input.DragDrop; +using Avalonia.Input; using Avalonia.Win32.Interop; -using IDataObject = Avalonia.Input.DragDrop.IDataObject; +using IDataObject = Avalonia.Input.IDataObject; using IOleDataObject = System.Runtime.InteropServices.ComTypes.IDataObject; using System.IO; using System.Runtime.Serialization.Formatters.Binary; diff --git a/src/Windows/Avalonia.Win32/DragSource.cs b/src/Windows/Avalonia.Win32/DragSource.cs index 81dd790066..ea124e5f29 100644 --- a/src/Windows/Avalonia.Win32/DragSource.cs +++ b/src/Windows/Avalonia.Win32/DragSource.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Text; using System.Threading.Tasks; -using Avalonia.Input.DragDrop; +using Avalonia.Input; using Avalonia.Input.Platform; using Avalonia.Threading; using Avalonia.Win32.Interop; diff --git a/src/Windows/Avalonia.Win32/OleDataObject.cs b/src/Windows/Avalonia.Win32/OleDataObject.cs index ee1c3046eb..85d1daadeb 100644 --- a/src/Windows/Avalonia.Win32/OleDataObject.cs +++ b/src/Windows/Avalonia.Win32/OleDataObject.cs @@ -6,13 +6,13 @@ using System.Runtime.InteropServices; using System.Runtime.InteropServices.ComTypes; using System.Runtime.Serialization.Formatters.Binary; using System.Text; -using Avalonia.Input.DragDrop; +using Avalonia.Input; using Avalonia.Win32.Interop; using IDataObject = System.Runtime.InteropServices.ComTypes.IDataObject; namespace Avalonia.Win32 { - class OleDataObject : Avalonia.Input.DragDrop.IDataObject + class OleDataObject : Avalonia.Input.IDataObject { private IDataObject _wrapped; diff --git a/src/Windows/Avalonia.Win32/OleDropTarget.cs b/src/Windows/Avalonia.Win32/OleDropTarget.cs index e3791747b1..500c03e317 100644 --- a/src/Windows/Avalonia.Win32/OleDropTarget.cs +++ b/src/Windows/Avalonia.Win32/OleDropTarget.cs @@ -1,9 +1,8 @@ -using Avalonia.Input.DragDrop; -using Avalonia.Input.DragDrop.Raw; -using Avalonia.Input; +using Avalonia.Input; +using Avalonia.Input.Raw; using Avalonia.Platform; using Avalonia.Win32.Interop; -using IDataObject = Avalonia.Input.DragDrop.IDataObject; +using IDataObject = Avalonia.Input.IDataObject; using IOleDataObject = System.Runtime.InteropServices.ComTypes.IDataObject; namespace Avalonia.Win32