From 4161571104964c0d309b338595e497b78eb54cda Mon Sep 17 00:00:00 2001
From: jpbruyere <jp.bruyere@hotmail.com>
Date: Mon, 14 Sep 2015 09:58:46 +0200
Subject: [PATCH] Draw borders inside Margin, this allow single level of border
 with margin, Background will mostly be set in child of border, if not border
 will have a background outside = Margin width

---
 Templates/Window.goml        | 2 +-
 src/GraphicObjects/Border.cs | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Templates/Window.goml b/Templates/Window.goml
index 55c85f3d..2f3711f1 100755
--- a/Templates/Window.goml
+++ b/Templates/Window.goml
@@ -6,7 +6,7 @@
 				<GraphicObject Width="5"/>
 				<Image Name="Image" Margin="1" Width="12" Height="12" Path="#go.Images.Icons.tetra.png"/>
 				<Label Foreground="White" Width="0" Name="Title" Margin="1" TextAlignment="Center" />
-				<Border CornerRadius="6" BorderWidth="1" Margin="0" BorderColor="Transparent"  Height="12" Width="12"
+				<Border CornerRadius="6" BorderWidth="1" 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"/>
diff --git a/src/GraphicObjects/Border.cs b/src/GraphicObjects/Border.cs
index 3f977267..1bc2b729 100644
--- a/src/GraphicObjects/Border.cs
+++ b/src/GraphicObjects/Border.cs
@@ -51,18 +51,18 @@ namespace go
 		{
 			Rectangle rBack = new Rectangle (Slot.Size);
 
+			rBack.Inflate (-Margin);
 			if (BorderWidth > 0) 
-				rBack.Inflate (-BorderWidth / 2);
+				rBack.Inflate (-BorderWidth / 2);			
 
 			gr.Color = Background;
 			CairoHelpers.CairoRectangle(gr,rBack,CornerRadius);
 			gr.Fill ();
 
 			if (BorderWidth > 0) {
-
 				gr.LineWidth = BorderWidth;
 				gr.Color = BorderColor;
-				CairoHelpers.CairoRectangle(gr,rBack,CornerRadius);
+				CairoHelpers.CairoRectangle(gr, rBack, CornerRadius);
 				gr.Stroke ();
 			}
 		}		
-- 
2.47.3