From b70e8474217e270e5d6d39d34727b4460d546c94 Mon Sep 17 00:00:00 2001
From: jogibear9988 <jochen.kuehner@gmx.de>
Date: Sun, 2 Nov 2014 21:57:25 +0100
Subject: [PATCH] Show a Icon for the WindowClone in the Designer

---
 .../Project/Controls/ControlStyles.xaml       |  13 ++-
 .../WpfDesign.Designer/Project/Converters.cs  |  82 +++++++++++-------
 .../Images/Icons.32x32.EmptyProjectIcon.png   | Bin 0 -> 891 bytes
 .../Project/WpfDesign.Designer.csproj         |   3 +
 4 files changed, 59 insertions(+), 39 deletions(-)
 create mode 100644 src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Images/Icons.32x32.EmptyProjectIcon.png

diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/ControlStyles.xaml b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/ControlStyles.xaml
index 77ed2ad5cc..a0d1ac20a9 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/ControlStyles.xaml
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/ControlStyles.xaml
@@ -120,14 +120,11 @@
 					<Border Background="{DynamicResource {x:Static SystemColors.GradientActiveCaptionBrushKey}}" BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}" BorderThickness="1,1,1,1">
 						<DockPanel Margin="4,0,4,4">
 							<DockPanel Height="26" DockPanel.Dock="Top">
-								<Image Width="16" Height="16" Margin="1,0,0,0" Source="{TemplateBinding Window.Icon}" />
-								<Button Name="CloseButton" VerticalAlignment="Top" Width="43" Height="17" DockPanel.Dock="Right">
-									<Path Fill="#FFF6F2F2" Stretch="Uniform" Margin="1" Stroke="#FF808080" Data="M160,400 L176,400 192,384 208,400 224,400 200,376 224,352 208,352 192,368 176,352 160,352 184,376 z" />
-								</Button>
-								<Button Name="MaximiseButton" VerticalAlignment="Top" Width="25" Height="17" DockPanel.Dock="Right" />
-								<Button Name="MinimizeButton" VerticalAlignment="Top" Width="25" Height="17" DockPanel.Dock="Right">
-									<!--<Rectangle Fill="#FFF6F2F2" RadiusX="0.5" RadiusY="0.5" Width="12" Height="5" Stroke="#FF808080" VerticalAlignment="Bottom" HorizontalAlignment="Center"/>-->
-								</Button>
+								<Image Width="16" Height="16" Margin="1,0,0,0" Source="/ICSharpCode.WpfDesign.Designer;component/Images/Icons.32x32.EmptyProjectIcon.png" Visibility="{Binding Window.Icon, Converter={x:Static Converters:CollapsedWhenZero.Instance}}" />
+								<Image Width="16" Height="16" Margin="1,0,0,0" Source="{TemplateBinding Window.Icon}" Visibility="{Binding Window.Icon, Converter={x:Static Converters:CollapsedWhenNotNull.Instance}}" />
+								<Button Content="r" FontFamily="Marlett" Name="CloseButton" VerticalAlignment="Top" Width="43" Height="17" DockPanel.Dock="Right" />
+								<Button Content="1" FontFamily="Marlett" Name="MinimizeButton" VerticalAlignment="Top" Width="25" Height="17" DockPanel.Dock="Right" />
+								<Button Content="0" FontFamily="Marlett" Name="MaximiseButton" VerticalAlignment="Top" Width="25" Height="17" DockPanel.Dock="Right" />
 								<Label Margin="4,0,0,0" Content="{TemplateBinding Window.Title}" />
 							</DockPanel>
 							<Border Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}">
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Converters.cs b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Converters.cs
index 92a11aa73e..e2df3c5568 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Converters.cs
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Converters.cs
@@ -111,6 +111,26 @@ namespace ICSharpCode.WpfDesign.Designer.Converters
 		}
 	}
 
+	public class CollapsedWhenNotNull : IValueConverter
+	{
+		[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes", Justification = "converter is immutable")]
+		public static readonly CollapsedWhenNotNull Instance = new CollapsedWhenNotNull();
+
+		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			if (value != null)
+			{
+				return Visibility.Collapsed;
+			}
+			return Visibility.Visible;
+		}
+
+		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			throw new NotImplementedException();
+		}
+	}
+
 	public class FalseWhenNull : IValueConverter
 	{
 		[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes", Justification = "converter is immutable")]
@@ -160,37 +180,37 @@ namespace ICSharpCode.WpfDesign.Designer.Converters
 		}
 	}
 
-    public class ControlToRealWidthConverter : IMultiValueConverter
-    {
-        public static readonly ControlToRealWidthConverter Instance = new ControlToRealWidthConverter();
-
-        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
-        {
-            return PlacementOperation.GetRealElementSize((UIElement)values[0]).Width;
-        }
-
-        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-
-    public class ControlToRealHeightConverter : IMultiValueConverter
-    {
-        public static readonly ControlToRealHeightConverter Instance = new ControlToRealHeightConverter();
-
-        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
-        {
-            return PlacementOperation.GetRealElementSize((UIElement)values[0]).Height;
-        }
-
-        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-
-    public class FormatDoubleConverter : IValueConverter
+	public class ControlToRealWidthConverter : IMultiValueConverter
+	{
+		public static readonly ControlToRealWidthConverter Instance = new ControlToRealWidthConverter();
+
+		public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+		{
+			return PlacementOperation.GetRealElementSize((UIElement)values[0]).Width;
+		}
+
+		public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+		{
+			throw new NotImplementedException();
+		}
+	}
+
+	public class ControlToRealHeightConverter : IMultiValueConverter
+	{
+		public static readonly ControlToRealHeightConverter Instance = new ControlToRealHeightConverter();
+
+		public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+		{
+			return PlacementOperation.GetRealElementSize((UIElement)values[0]).Height;
+		}
+
+		public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+		{
+			throw new NotImplementedException();
+		}
+	}
+
+	public class FormatDoubleConverter : IValueConverter
 	{
 		[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Security", "CA2104:DoNotDeclareReadOnlyMutableReferenceTypes", Justification = "converter is immutable")]
 		public static readonly FormatDoubleConverter Instance=new FormatDoubleConverter();
diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Images/Icons.32x32.EmptyProjectIcon.png b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Images/Icons.32x32.EmptyProjectIcon.png
new file mode 100644
index 0000000000000000000000000000000000000000..1977344cf2296c7e31161478f4705d86226d6c6c
GIT binary patch
literal 891
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN
z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!pj3%#L`iUdT1k0gQ7S_~VrE{6o}X)oLYc9i
zsh**M!Iz?i3=B-KJY5_^BHZ6jKkXe7D04jaic!>4C5<~Sf+~(#f>}*Br`Q^#DV<(<
zW|>LwkyfGBFDBh#wz)yVr{j{QwXr6q*crY3;S(%)`nd_ed-}0TlRo47=ick})i)G`
z$^AHBTk!sG&Aaz`?|8YQqP&G42zO|j9xuwW@DX~_C3^V&$0H$=ZyTlWzsb!}$HZ#O
zC{n^+u=sTUpT5eN?C%d>^;^c|eN}pY+dd}ao5J>s&2QG{&3XL7BC2oM!QLNg{7FA7
z1@G^@apRdY$9}UNm-|Kk)UBSix2&kE;l-o<Jx5f|Jm2*CZOk>Zc5U6bm`6=}s>Jo`
z${zhuXD_n5H8D2Z`PpyDIcsMg%RI+fw?^yL@oi0RF4K7wmgR{FrZ(RwTFp88RQrZy
zrF^gB_>{kt8D9(gbFAoJ!4nb2K-V@`_BT3j8tWuFE`8Txe0a3>l--ss@thI=OB`;t
zPvK9J<X2eE(Q(CJ$I2l%_0T;p=0~e^y$)RC56f9+n(RE+mowt-1BVad(qY?nOkn`J
z_ibzP8=l_Hw^l8vHg65i*Y#Lw^!SOi@FeYCi@3xC8?R5kuy59Zi{i-^pK3(f=l?yp
za8n{{=}Q5=X*@~`D;U`2{vWEVmH%e@%Jt7-xi^&;dhdSUy<pe%&e(Emf%4_D2Q9yH
zGe$;6@=Ox9Jj!BZY#gZ|(BN}IlgY@)XvY2b$N&7<BXYvkPjJG#dFMRdeg3(`K@aGr
zEn7_7iq>D(W-Xc+%(7(JGNVbm@8)Sv=$@nGu>7)N|8eH!mo*`BOO_Z+Kh3)Pt{#}H
zqOQLA=FP}6XU=#u#sEVrYV9;j8NP_MVPL%qnwp(AbIfL(O@nX^4JZ2g`yb9Q@d7KB
z>TUD&^-U})3gUXAw45Vg_0^tZ_I7qqlT}m<CZBA%crg&-jHN+_RsWThm4g(-EyeeB
zC@If8n$&nOVFJ@mrJcbnE$!{E4<9--!{@}#FaBFh7-t=*UlG?{`)U4<U|`;0@O1Ta
JS?83{1OUcjgtq_y

literal 0
HcmV?d00001

diff --git a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/WpfDesign.Designer.csproj b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/WpfDesign.Designer.csproj
index cd35d12092..40aadb1395 100644
--- a/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/WpfDesign.Designer.csproj
+++ b/src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/WpfDesign.Designer.csproj
@@ -458,4 +458,7 @@
   <ItemGroup>
     <Resource Include="Images\canvas.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\Icons.32x32.EmptyProjectIcon.png" />
+  </ItemGroup>
 </Project>
\ No newline at end of file