From dbacf80511f5dd0ee18cb97b3b81e656fb4fc339 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Sat, 1 Dec 2018 14:53:19 +0000
Subject: [PATCH] tidy decorated window.

---
 samples/ControlCatalog/DecoratedWindow.xaml | 65 ++++++++++-----------
 1 file changed, 32 insertions(+), 33 deletions(-)

diff --git a/samples/ControlCatalog/DecoratedWindow.xaml b/samples/ControlCatalog/DecoratedWindow.xaml
index fdb18fcca2..9f05cd1f57 100644
--- a/samples/ControlCatalog/DecoratedWindow.xaml
+++ b/samples/ControlCatalog/DecoratedWindow.xaml
@@ -1,39 +1,38 @@
-<Window xmlns="https://github.com/avaloniaui" MinWidth="500" MinHeight="300"
+<Window xmlns="https://github.com/avaloniaui" MinWidth="500" MinHeight="300"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         x:Class="ControlCatalog.DecoratedWindow"
         Title="Avalonia Control Gallery"
-        Icon="/Assets/test_icon.ico"
         xmlns:local="clr-namespace:ControlCatalog" HasSystemDecorations="False" Name="Window">
-    <Grid RowDefinitions="5,*,5" ColumnDefinitions="5,*,5">
-        <DockPanel  Grid.Column="1"  Grid.Row="1" >
-            <Grid Name="TitleBar" Background="LightBlue" DockPanel.Dock="Top" ColumnDefinitions="Auto,*,Auto">
-                <TextBlock VerticalAlignment="Center" Margin="5,0,0,0">Title</TextBlock>
-                <StackPanel Grid.Column="2" Orientation="Horizontal">
-                    <StackPanel.Styles>
-                        <Style Selector="Button">
-                            <Setter Property="Margin" Value="2"/>
-                        </Style>
-                    </StackPanel.Styles>
-                    <Button Name="MinimizeButton">_</Button>
-                    <Button Name="MaximizeButton">[ ]</Button>
-                    <Button Name="CloseButton">X</Button>
-                </StackPanel>
-            </Grid>
-            <Border Background="White" Margin="5">
-                <StackPanel>
-                <TextBlock>Hello world!</TextBlock>
+  <Grid RowDefinitions="5,*,5" ColumnDefinitions="5,*,5">
+    <DockPanel  Grid.Column="1"  Grid.Row="1" >
+      <Grid Name="TitleBar" Background="LightBlue" DockPanel.Dock="Top" ColumnDefinitions="Auto,*,Auto">
+      <TextBlock VerticalAlignment="Center" Margin="5,0,0,0">Title</TextBlock>
+        <StackPanel Grid.Column="2" Orientation="Horizontal">
+          <StackPanel.Styles>
+            <Style Selector="Button">
+              <Setter Property="Margin" Value="2"/>
+            </Style>
+          </StackPanel.Styles>
+        <Button Name="MinimizeButton">_</Button>
+        <Button Name="MaximizeButton">[ ]</Button>
+        <Button Name="CloseButton">X</Button>
+        </StackPanel>
+      </Grid>
+      <Border Background="White" Margin="5">
+        <StackPanel>
+        <TextBlock>Hello world!</TextBlock>
 
-                <CheckBox IsChecked="{Binding ElementName=Window, Path=HasSystemDecorations}">Decorated</CheckBox>
-                </StackPanel>
-            </Border>
-        </DockPanel>
-        <Border Name="TopLeft" Background="Red"/>
-        <Border Name="TopRight" Background="Red" Grid.Column="2" />
-        <Border Name="BottomLeft" Background="Red" Grid.Row="2" />
-        <Border Name="BottomRight" Background="Red"  Grid.Row="2" Grid.Column="2"/>
-        <Border Name="Top" Background="Blue" Grid.Column="1" />
-        <Border Name="Right" Background="Blue" Grid.Row="1"  Grid.Column="2" />
-        <Border Name="Bottom" Background="Blue" Grid.Row="2" Grid.Column="1"  />
-        <Border Name="Left" Background="Blue"  Grid.Row="1" />
-    </Grid>
+        <CheckBox IsChecked="{Binding ElementName=Window, Path=HasSystemDecorations}">Decorated</CheckBox>
+        </StackPanel>
+      </Border>
+    </DockPanel>
+    <Border Name="TopLeft" Background="Red"/>
+    <Border Name="TopRight" Background="Red" Grid.Column="2" />
+    <Border Name="BottomLeft" Background="Red" Grid.Row="2" />
+    <Border Name="BottomRight" Background="Red"  Grid.Row="2" Grid.Column="2"/>
+    <Border Name="Top" Background="Blue" Grid.Column="1" />
+    <Border Name="Right" Background="Blue" Grid.Row="1"  Grid.Column="2" />
+    <Border Name="Bottom" Background="Blue" Grid.Row="2" Grid.Column="1"  />
+    <Border Name="Left" Background="Blue"  Grid.Row="1" />
+  </Grid>
 </Window>