Skip to content

Commit

Permalink
fix: Fixed samples app compilation due to generators
Browse files Browse the repository at this point in the history
  • Loading branch information
MartinZikmund committed Sep 11, 2020
1 parent e467f90 commit 69189ba
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
using System.Collections.ObjectModel;
using System.ComponentModel;

namespace UITests.Shared.Microsoft_UI_Xaml_Controls.TreeViewTests
namespace MUX.UITests.Shared.Microsoft_UI_Xaml_Controls.TreeViewTests
{
public class TreeViewItemSource : INotifyPropertyChanged
public partial class TreeViewItemSource : INotifyPropertyChanged
{
public event PropertyChangedEventHandler PropertyChanged;
public String Content { get; set; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
namespace UITests.Shared.Microsoft_UI_Xaml_Controls.TreeViewTests
{
// An empty class to test TreeViewNode inheritance
class TreeViewNode2 : TreeViewNode
public partial class TreeViewNode2 : TreeViewNode
{

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
x:Name="TwoPaneViewTestPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="using:UITests.Shared.Microsoft_UI_Xaml_Controls.TreeViewTests"
xmlns:local="using:MUX.UITests.Shared.Microsoft_UI_Xaml_Controls.TreeViewTests"
xmlns:xamarin="http://uno.ui/xamarin"
xmlns:muxcontrols="using:Microsoft.UI.Xaml.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
using System.Threading.Tasks;
using Uno.UI.Samples.Controls;
using MUXControlsTestApp.Utilities;
using MUX.UITests.Shared.Microsoft_UI_Xaml_Controls.TreeViewTests;

namespace UITests.Shared.Microsoft_UI_Xaml_Controls.TreeViewTests
{
Expand Down Expand Up @@ -95,7 +96,7 @@ private async Task<ObservableCollection<TreeViewItemSource>> PrepareItemsSourceA
});
}

protected override void OnNavigatedFrom(NavigationEventArgs e)
protected internal override void OnNavigatedFrom(NavigationEventArgs e)
{
// Unset all override flags to avoid impacting subsequent tests
//TODO
Expand Down Expand Up @@ -517,7 +518,7 @@ private void SetupCustomDragUIOverride_Click(object sender, RoutedEventArgs e)
AutomationProperties.SetName(lastItem, "CustomDragUIOverrideDropTarget");
}

private void Item_DragEnter(object sender, DragEventArgs e)
private void Item_DragEnter(object sender, Windows.UI.Xaml.DragEventArgs e)
{
e.DragUIOverride.Caption = "test caption";
e.DragUIOverride.IsCaptionVisible = true;
Expand All @@ -526,7 +527,7 @@ private void Item_DragEnter(object sender, DragEventArgs e)
e.Handled = true;
}

private async void TreeView_Drop(object sender, DragEventArgs e)
private async void TreeView_Drop(object sender, Windows.UI.Xaml.DragEventArgs e)
{
try
{
Expand All @@ -546,7 +547,7 @@ private void Draggable_DragStarting(UIElement sender, DragStartingEventArgs args
Results.Text = "Drag started";
}

private void TreeView_DragOver(object sender, DragEventArgs e)
private void TreeView_DragOver(object sender, Windows.UI.Xaml.DragEventArgs e)
{
e.AcceptedOperation = DataPackageOperation.Copy;
}
Expand All @@ -557,12 +558,12 @@ private void SizeTreeViewsForDrags_Click(object sender, RoutedEventArgs e)
TestTreeView2.Height = 200;
}

private void DropTarget_DragOver(object sender, DragEventArgs e)
private void DropTarget_DragOver(object sender, Windows.UI.Xaml.DragEventArgs e)
{
e.AcceptedOperation = DataPackageOperation.Copy;
}

private async void DropTarget_Drop(object sender, DragEventArgs e)
private async void DropTarget_Drop(object sender, Windows.UI.Xaml.DragEventArgs e)
{
try
{
Expand Down Expand Up @@ -701,13 +702,13 @@ private void SetupDragDropHandlersForApiTest_Click(object sender, RoutedEventArg
ContentModeTestTreeView2.Drop += DropForApiTest;
}

private void DragEnterForApiTest(object sender, DragEventArgs args)
private void DragEnterForApiTest(object sender, Windows.UI.Xaml.DragEventArgs args)
{
args.AcceptedOperation = DataPackageOperation.Copy;
Results.Text = "DragEnter";
}

private void DragOverForApiTest(object sender, DragEventArgs args)
private void DragOverForApiTest(object sender, Windows.UI.Xaml.DragEventArgs args)
{
args.AcceptedOperation = DataPackageOperation.Copy;
if (!Results.Text.Contains("DragOver"))
Expand All @@ -716,12 +717,12 @@ private void DragOverForApiTest(object sender, DragEventArgs args)
}
}

private void DragLeaveForApiTest(object sender, DragEventArgs args)
private void DragLeaveForApiTest(object sender, Windows.UI.Xaml.DragEventArgs args)
{
Results.Text += "->DragLeave";
}

private void DropForApiTest(object sender, DragEventArgs args)
private void DropForApiTest(object sender, Windows.UI.Xaml.DragEventArgs args)
{
Results.Text += "->Drop";
}
Expand Down

0 comments on commit 69189ba

Please sign in to comment.