Merge pull request #202 from xamarin/bleroy-vs-icons-in-standalone

Enable the Windows standalone app to use VS icons

3 files changed, 31 insertions, 18 deletions

diff --git a/Xamarin.PropertyEditing.Windows.Standalone/MainWindow.xaml.cs b/Xamarin.PropertyEditing.Windows.Standalone/MainWindow.xaml.cs
index 1028f08..654b0c6 100644
--- a/Xamarin.PropertyEditing.Windows.Standalone/MainWindow.xaml.cs
+++ b/Xamarin.PropertyEditing.Windows.Standalone/MainWindow.xaml.cs
@@ -26,6 +26,11 @@ namespace Xamarin.PropertyEditing.Windows.Standalone
 			this.panel.EditorProvider = new MockEditorProvider ();
 
 			this.panel.ResourceProvider = new MockResourceProvider ();
+#if USE_VS_ICONS
+			this.panel.Resources.MergedDictionaries.Add (new ResourceDictionary {
+				Source = new Uri ("pack://application:,,,/ProppyIcons.xaml", UriKind.RelativeOrAbsolute)
+			});
+#endif
 		}
 
 		private async void Button_Click (object sender, RoutedEventArgs e)
diff --git a/Xamarin.PropertyEditing.Windows.Standalone/Xamarin.PropertyEditing.Windows.Standalone.csproj b/Xamarin.PropertyEditing.Windows.Standalone/Xamarin.PropertyEditing.Windows.Standalone.csproj
index 0f2ed58..0bdf749 100644
--- a/Xamarin.PropertyEditing.Windows.Standalone/Xamarin.PropertyEditing.Windows.Standalone.csproj
+++ b/Xamarin.PropertyEditing.Windows.Standalone/Xamarin.PropertyEditing.Windows.Standalone.csproj
@@ -33,6 +33,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup Condition="Exists('..\..\..\Xamarin.Designer.VisualStudio\src\VisualStudio.Designer\ProppyIcons.xaml')">
+    <DefineConstants>$(DefineConstants);USE_VS_ICONS</DefineConstants>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -68,6 +71,13 @@
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
+  <!-- Conditionally include resource file with icons when the file exists. To be replaced later with default open icons. -->
+  <ItemGroup Condition="Exists('..\..\..\Xamarin.Designer.VisualStudio\src\VisualStudio.Designer\ProppyIcons.xaml')">
+    <Page Include="..\..\..\Xamarin.Designer.VisualStudio\src\VisualStudio.Designer\ProppyIcons.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
   <ItemGroup>
     <Compile Include="MockedControlButton.cs" />
     <Compile Include="MockedSampleControlButton.cs" />
diff --git a/Xamarin.PropertyEditing.Windows/Themes/Resources.xaml b/Xamarin.PropertyEditing.Windows/Themes/Resources.xaml
index 1cc5ae2..52d2bcb 100644
--- a/Xamarin.PropertyEditing.Windows/Themes/Resources.xaml
+++ b/Xamarin.PropertyEditing.Windows/Themes/Resources.xaml
@@ -546,41 +546,39 @@
 		</Setter>
 	</Style>
 
-	<Style x:Key="BrushChoiceIconStyle" TargetType="Path">
-		<Setter Property="Stroke" Value="{DynamicResource InputForegroundBrush}" />
-		<Setter Property="Fill" Value="{DynamicResource InputForegroundBrush}" />
-		<Setter Property="VerticalAlignment" Value="Center" />
-	</Style>
-
 	<local:BrushChoiceTemplateSelector x:Key="BrushChoiceTemplateSelector">
 		<local:BrushChoiceTemplateSelector.NoBrushTemplate>
 			<DataTemplate>
-				<RadioButton Style="{DynamicResource ChoiceControlItem}" GroupName="{Binding Name,RelativeSource={RelativeSource FindAncestor,AncestorType=local:ChoiceControl},Mode=OneTime}">
-					<Path Style="{StaticResource BrushChoiceIconStyle}" Data="{DynamicResource BrushChoiceNoBrushGeometry}" MinHeight="10" MinWidth="15"/>
+				<RadioButton Style="{DynamicResource ChoiceControlItem}" MinHeight="20" MinWidth="20"
+							 GroupName="{Binding Name,RelativeSource={RelativeSource FindAncestor,AncestorType=local:ChoiceControl},Mode=OneTime}">
+					<ContentControl ContentTemplate="{DynamicResource BrushChoiceNoBrushIcon}"/>
 				</RadioButton>
 			</DataTemplate>
 		</local:BrushChoiceTemplateSelector.NoBrushTemplate>
 		<local:BrushChoiceTemplateSelector.SolidBrushTemplate>
 			<DataTemplate>
-				<RadioButton Style="{DynamicResource ChoiceControlItem}" GroupName="{Binding Name,RelativeSource={RelativeSource FindAncestor,AncestorType=local:ChoiceControl},Mode=OneTime}">
-					<Path Style="{StaticResource BrushChoiceIconStyle}" Data="{DynamicResource BrushChoiceSolidBrushGeometry}" MinHeight="10" MinWidth="15"/>
+				<RadioButton Style="{DynamicResource ChoiceControlItem}" MinHeight="20" MinWidth="20"
+							 GroupName="{Binding Name,RelativeSource={RelativeSource FindAncestor,AncestorType=local:ChoiceControl},Mode=OneTime}">
+					<ContentControl ContentTemplate="{DynamicResource BrushChoiceSolidBrushIcon}"/>
 				</RadioButton>
 			</DataTemplate>
 		</local:BrushChoiceTemplateSelector.SolidBrushTemplate>
-		<local:BrushChoiceTemplateSelector.ResourceBrushTemplate>
+		<local:BrushChoiceTemplateSelector.MaterialDesignBrushTemplate>
 			<DataTemplate>
-				<RadioButton Style="{DynamicResource ChoiceControlItem}" GroupName="{Binding Name,RelativeSource={RelativeSource FindAncestor,AncestorType=local:ChoiceControl},Mode=OneTime}">
-					<ContentControl Content="{DynamicResource BrushChoiceResourceBrushIcon}" MinHeight="10" MinWidth="15"/>
+				<RadioButton Style="{DynamicResource ChoiceControlItem}" MinHeight="20" MinWidth="20"
+							 GroupName="{Binding Name,RelativeSource={RelativeSource FindAncestor,AncestorType=local:ChoiceControl},Mode=OneTime}">
+					<ContentControl ContentTemplate="{DynamicResource BrushChoiceMaterialDesignIcon}"/>
 				</RadioButton>
 			</DataTemplate>
-		</local:BrushChoiceTemplateSelector.ResourceBrushTemplate>
-		<local:BrushChoiceTemplateSelector.MaterialDesignBrushTemplate>
+		</local:BrushChoiceTemplateSelector.MaterialDesignBrushTemplate>
+		<local:BrushChoiceTemplateSelector.ResourceBrushTemplate>
 			<DataTemplate>
-				<RadioButton Style="{DynamicResource ChoiceControlItem}" GroupName="{Binding Name,RelativeSource={RelativeSource FindAncestor,AncestorType=local:ChoiceControl},Mode=OneTime}">
-					<Path Style="{StaticResource BrushChoiceIconStyle}" Data="{DynamicResource BrushChoiceMaterialDesignGeometry}" MinHeight="10" MinWidth="15"/>
+				<RadioButton Style="{DynamicResource ChoiceControlItem}" MinHeight="20" MinWidth="20"
+							 GroupName="{Binding Name,RelativeSource={RelativeSource FindAncestor,AncestorType=local:ChoiceControl},Mode=OneTime}">
+					<ContentControl ContentTemplate="{DynamicResource BrushChoiceResourceBrushIcon}"/>
 				</RadioButton>
 			</DataTemplate>
-		</local:BrushChoiceTemplateSelector.MaterialDesignBrushTemplate>
+		</local:BrushChoiceTemplateSelector.ResourceBrushTemplate>
 	</local:BrushChoiceTemplateSelector>
 
 	<Style TargetType="local:BrushTabbedEditorControl">