Add sample mock control, and add two buttons for it in the Windows standalone app.

7 files changed, 46 insertions, 17 deletions

diff --git a/Xamarin.PropertyEditing.Windows.Standalone/IMockedControl.cs b/Xamarin.PropertyEditing.Windows.Standalone/IMockedControl.cs
new file mode 100644
index 0000000..3edab63
--- /dev/null
+++ b/Xamarin.PropertyEditing.Windows.Standalone/IMockedControl.cs
@@ -0,0 +1,7 @@
+namespace Xamarin.PropertyEditing.Windows.Standalone
+{
+	interface IMockedControl
+	{
+		object MockedControl { get; }
+	}
+}
diff --git a/Xamarin.PropertyEditing.Windows.Standalone/MainWindow.xaml b/Xamarin.PropertyEditing.Windows.Standalone/MainWindow.xaml
index 53a11d9..e5fb974 100644
--- a/Xamarin.PropertyEditing.Windows.Standalone/MainWindow.xaml
+++ b/Xamarin.PropertyEditing.Windows.Standalone/MainWindow.xaml
@@ -1,4 +1,4 @@
-<Window x:Class="Xamarin.PropertyEditing.Windows.Standalone.MainWindow"
+<Window x:Class="Xamarin.PropertyEditing.Windows.Standalone.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -16,11 +16,15 @@
 		<Grid.RowDefinitions>
 			<RowDefinition />
 			<RowDefinition />
+			<RowDefinition />
+			<RowDefinition />
 		</Grid.RowDefinitions>
 
-		<local:MockedWpfButton Grid.Row="0" Grid.Column="0" Click="Button_Click">Select me (Mock)</local:MockedWpfButton>
-		<Button Grid.Row="1" Grid.Column="0" Click="Button_Click">Select me (WPF)</Button>
+		<local:MockedSampleControlButton Grid.Row="0" Grid.Column="0" Click="Button_Click">Mocked Sample 1</local:MockedSampleControlButton>
+		<local:MockedSampleControlButton Grid.Row="1" Grid.Column="0" Click="Button_Click">Mocked Sample 2</local:MockedSampleControlButton>
+		<local:MockedWpfButton Grid.Row="2" Grid.Column="0" Click="Button_Click">Mocked WPF button</local:MockedWpfButton>
+		<Button Grid.Row="3" Grid.Column="0" Click="Button_Click">Actual WPF button</Button>
 
-		<xamarinprops:PropertyEditorPanel Name="panel" Grid.Row="0" Grid.RowSpan="2" Grid.Column="1" />
+		<xamarinprops:PropertyEditorPanel Name="panel" Grid.Row="0" Grid.RowSpan="4" Grid.Column="1" />
 	</Grid>
 </Window>
\ No newline at end of file
diff --git a/Xamarin.PropertyEditing.Windows.Standalone/MainWindow.xaml.cs b/Xamarin.PropertyEditing.Windows.Standalone/MainWindow.xaml.cs
index 7037535..92fe3c8 100644
--- a/Xamarin.PropertyEditing.Windows.Standalone/MainWindow.xaml.cs
+++ b/Xamarin.PropertyEditing.Windows.Standalone/MainWindow.xaml.cs
@@ -16,7 +16,7 @@ namespace Xamarin.PropertyEditing.Windows.Standalone
 
 		private void Button_Click (object sender, RoutedEventArgs e)
 		{
-			var mockedButton = sender as MockedWpfButton;
+			var mockedButton = sender as IMockedControl;
 			var inspectedObject = (mockedButton == null || mockedButton.MockedControl == null)
 				? sender : mockedButton.MockedControl;
 			if (this.panel.SelectedItems.Contains (inspectedObject))
diff --git a/Xamarin.PropertyEditing.Windows.Standalone/MockedControlButton.cs b/Xamarin.PropertyEditing.Windows.Standalone/MockedControlButton.cs
new file mode 100644
index 0000000..cda6719
--- /dev/null
+++ b/Xamarin.PropertyEditing.Windows.Standalone/MockedControlButton.cs
@@ -0,0 +1,18 @@
+using System.Windows.Controls;
+using Xamarin.PropertyEditing.Tests.MockControls;
+
+namespace Xamarin.PropertyEditing.Windows.Standalone
+{
+	public abstract class MockedControlButton<T> : Button, IMockedControl
+		where T : MockControl
+	{
+		public MockedControlButton(T mockedControl)
+		{
+			MockedControl = mockedControl;
+		}
+
+		public T MockedControl { get; }
+
+		object IMockedControl.MockedControl => MockedControl;
+	}
+}
diff --git a/Xamarin.PropertyEditing.Windows.Standalone/MockedSampleControlButton.cs b/Xamarin.PropertyEditing.Windows.Standalone/MockedSampleControlButton.cs
new file mode 100644
index 0000000..17d9317
--- /dev/null
+++ b/Xamarin.PropertyEditing.Windows.Standalone/MockedSampleControlButton.cs
@@ -0,0 +1,8 @@
+using Xamarin.PropertyEditing.Tests.MockControls;
+
+namespace Xamarin.PropertyEditing.Windows.Standalone
+{
+	public class MockedSampleControlButton: MockedControlButton<MockSampleControl> {
+		public MockedSampleControlButton () : base(new MockSampleControl ()) { }
+	}
+}
diff --git a/Xamarin.PropertyEditing.Windows.Standalone/MockedWpfControlButton.cs b/Xamarin.PropertyEditing.Windows.Standalone/MockedWpfControlButton.cs
index 67e4312..5bce465 100644
--- a/Xamarin.PropertyEditing.Windows.Standalone/MockedWpfControlButton.cs
+++ b/Xamarin.PropertyEditing.Windows.Standalone/MockedWpfControlButton.cs
@@ -1,20 +1,9 @@
-using System.Windows.Controls;
 using Xamarin.PropertyEditing.Tests.MockControls;
 
 namespace Xamarin.PropertyEditing.Windows.Standalone
 {
-	public abstract class MockedWpfControlButton<T> : Button
-		where T : MockControl
-	{
-		public MockedWpfControlButton(T mockedControl)
-		{
-			MockedControl = mockedControl;
-		}
 
-		public T MockedControl { get; }
-	}
-
-	public class MockedWpfButton: MockedWpfControlButton<MockWpfButton> {
+	public class MockedWpfButton: MockedControlButton<MockWpfButton> {
 		public MockedWpfButton() : base(new MockWpfButton()) { }
 	}
 }
diff --git a/Xamarin.PropertyEditing.Windows.Standalone/Xamarin.PropertyEditing.Windows.Standalone.csproj b/Xamarin.PropertyEditing.Windows.Standalone/Xamarin.PropertyEditing.Windows.Standalone.csproj
index eaf6ab0..0f2ed58 100644
--- a/Xamarin.PropertyEditing.Windows.Standalone/Xamarin.PropertyEditing.Windows.Standalone.csproj
+++ b/Xamarin.PropertyEditing.Windows.Standalone/Xamarin.PropertyEditing.Windows.Standalone.csproj
@@ -62,12 +62,15 @@
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="IMockedControl.cs" />
     <Compile Include="MainWindow.xaml.cs">
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="MockedControlButton.cs" />
+    <Compile Include="MockedSampleControlButton.cs" />
     <Compile Include="MockedWpfControlButton.cs" />
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>