Skip to content

Commit

Permalink
fix(dragdrop): Fix nullable not supported on WinUI
Browse files Browse the repository at this point in the history
  • Loading branch information
dr1rrb committed Oct 16, 2020
1 parent b2b49bf commit aba7751
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions src/Uno.UI/UI/Xaml/Media/VisualTreeHelper.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#nullable enable
#nullable disable // Not supported by WinUI yet
// #define TRACE_HIT_TESTING

using System;
Expand Down Expand Up @@ -54,16 +54,16 @@ public static void DisconnectChildrenRecursive(UIElement element)
throw new NotSupportedException();
}

public static IEnumerable<UIElement> FindElementsInHostCoordinates(Point intersectingPoint, UIElement subtree)
public static IEnumerable<UIElement> FindElementsInHostCoordinates(Point intersectingPoint, UIElement/* ? */ subtree)
=> FindElementsInHostCoordinates(intersectingPoint, subtree, false);

[Uno.NotImplemented]
public static IEnumerable<UIElement> FindElementsInHostCoordinates(Rect intersectingRect, UIElement subtree)
public static IEnumerable<UIElement> FindElementsInHostCoordinates(Rect intersectingRect, UIElement/* ? */ subtree)
{
throw new NotSupportedException();
}

public static IEnumerable<UIElement> FindElementsInHostCoordinates(Point intersectingPoint, UIElement? subtree, bool includeAllElements)
public static IEnumerable<UIElement> FindElementsInHostCoordinates(Point intersectingPoint, UIElement/* ? */ subtree, bool includeAllElements)
{
if (subtree != null)
{
Expand Down Expand Up @@ -101,7 +101,7 @@ private static bool IsElementIntersecting(Point intersectingPoint, UIElement uiE
}

[Uno.NotImplemented]
public static IEnumerable<UIElement> FindElementsInHostCoordinates(Rect intersectingRect, UIElement subtree, bool includeAllElements)
public static IEnumerable<UIElement> FindElementsInHostCoordinates(Rect intersectingRect, UIElement/* ? */ subtree, bool includeAllElements)
{
throw new NotSupportedException();
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#if __ANDROID__
#nullable enable
#nullable disable // Not supported by WinUI yet

using Android.Content;
using System;
Expand All @@ -15,7 +15,7 @@ public static partial class Clipboard
{
private const string ClipboardDataLabel = nameof(Clipboard);

public static void SetContent(DataPackage? content)
public static void SetContent(DataPackage/* ? */ content)
{
if (content is null)
{
Expand Down

0 comments on commit aba7751

Please sign in to comment.