From 660b6f0e852e0ac51b868854f9b6dfa7de4ec8da Mon Sep 17 00:00:00 2001
From: jpbruyere <jp.bruyere@hotmail.com>
Date: Thu, 10 Sep 2015 10:07:33 +0200
Subject: [PATCH] * Window.goml:

* Window.cs: default window
---
 Templates/Window.goml        | 15 ++++++++++-----
 src/GraphicObjects/Window.cs |  5 ++++-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/Templates/Window.goml b/Templates/Window.goml
index 2ec25987..cf72c6bf 100755
--- a/Templates/Window.goml
+++ b/Templates/Window.goml
@@ -1,12 +1,17 @@
 <?xml version="1.0"?>
-<Border BorderWidth="1" BorderColor="LightGray" Margin="0">
+<Border BorderWidth="1" BorderColor="White" Margin="0" CornerRadius="20">
 	<VerticalStack Height="0" Width="0" Margin="0">
-		<Border BorderWidth="1" BorderColor="LightGray"  Height="-1" Width="0" Background="BlueCrayola">
+		<Border BorderWidth="1" BorderColor="White"  Height="-1" Width="0" Background="0,1;0,5;1,0;0,5">
 			<HorizontalStack Name="hs" Margin="1" Spacing="1" Height="-1" Width="0" Focusable="false" >
+				<GraphicObject Width="5" Height="0"/>
 				<Image Name="Image" Margin="1" Width="12" Height="12" Path="#go.Images.Icons.tetra.png"/>
-				<Label Width="0" Name="Title" Margin="1" />
-				<Image Focusable="true" Name="Image" Margin="1" Width="12" Height="12" Path="#go.Images.Icons.exit.svg"
-					MouseEnter="{Background=Red}" MouseLeave="{Background=Transparent}" MouseClick="butQuitPress"/>
+				<Label Foreground="White" Width="0" Name="Title" Margin="1" TextAlignment="Center" />
+				<Border CornerRadius="6" BorderWidth="1" Margin="0" BorderColor="Transparent"  Height="12" Width="12"
+					MouseEnter="{BorderColor=White}" MouseLeave="{BorderColor=Transparent}">
+					<Image Focusable="true" Name="Image" Margin="0" Width="0" Height="0" Path="#go.Images.Icons.exit2.svg"
+						 MouseClick="butQuitPress"/>
+				</Border>
+				<GraphicObject Width="5" Height="0"/>
 			</HorizontalStack>
 		</Border>
 		<Container Name="Content" Margin="0" Width="0" Height="0"/>
diff --git a/src/GraphicObjects/Window.cs b/src/GraphicObjects/Window.cs
index 0c275f7a..09488499 100644
--- a/src/GraphicObjects/Window.cs
+++ b/src/GraphicObjects/Window.cs
@@ -176,7 +176,10 @@ namespace go
 
 		void butQuitPress (object sender, MouseButtonEventArgs e)
 		{
-			TopContainer.DeleteWidget (this);
+			ILayoutable parent = (sender as GraphicObject).Parent;
+			while(!(parent is Window))
+				parent = parent.Parent;
+			TopContainer.DeleteWidget (parent as GraphicObject);
 		}
 
 
-- 
2.47.3