From 3260d86cda78bd53070f7318863df642f3492588 Mon Sep 17 00:00:00 2001
From: jpbruyere <jp.bruyere@hotmail.com>
Date: Fri, 12 Jun 2015 14:42:57 +0200
Subject: [PATCH] - Window - Popper - redraw clipping debug, solved old top
 container clipping bug :-)

---
 GOLib.csproj                           |   1 +
 Templates/Popper.goml                  |   2 +-
 Templates/Window.goml                  |  13 +++
 Tests/GOLIBTest_4.cs                   |  21 ++---
 Tests/GOLIBTest_Container.cs           | 119 +++++++++++++++++++++++++
 Tests/GOLIBTest_Label.cs               | 119 +++++++++++++++++++++++++
 Tests/GOLIBTest_Window.cs              | 119 +++++++++++++++++++++++++
 Tests/Interfaces/test4.goml            |  42 ++++-----
 Tests/Interfaces/testContainer.goml    |   6 ++
 Tests/Interfaces/testLabel.goml        |   3 +
 Tests/Interfaces/testWindow.goml       |  11 +++
 Tests/Tests.csproj                     |  14 ++-
 src/GraphicObjects/GenericStack.cs     |   2 +-
 src/GraphicObjects/GraphicObject.cs    |   2 +-
 src/GraphicObjects/PrivateContainer.cs |   6 +-
 src/GraphicObjects/Window.cs           |  51 ++++++++++-
 src/OpenTKGameWindow.cs                |   2 +-
 17 files changed, 492 insertions(+), 41 deletions(-)
 create mode 100755 Templates/Window.goml
 create mode 100644 Tests/GOLIBTest_Container.cs
 create mode 100644 Tests/GOLIBTest_Label.cs
 create mode 100644 Tests/GOLIBTest_Window.cs
 create mode 100755 Tests/Interfaces/testContainer.goml
 create mode 100755 Tests/Interfaces/testLabel.goml
 create mode 100755 Tests/Interfaces/testWindow.goml

diff --git a/GOLib.csproj b/GOLib.csproj
index 91937816..77bce975 100644
--- a/GOLib.csproj
+++ b/GOLib.csproj
@@ -172,5 +172,6 @@
     <EmbeddedResource Include="Images\Icons\expandable.svg" />
     <EmbeddedResource Include="Templates\Checkbox2.goml" />
     <EmbeddedResource Include="Templates\Popper.goml" />
+    <EmbeddedResource Include="Templates\Window.goml" />
   </ItemGroup>
 </Project>
diff --git a/Templates/Popper.goml b/Templates/Popper.goml
index 0a1d07e8..638c73c3 100755
--- a/Templates/Popper.goml
+++ b/Templates/Popper.goml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<Border BorderWidth="1" BorderColor="LightGray"  Height="50" Width="100" MouseClick="onMouseClick">
+<Border BorderWidth="1" BorderColor="LightGray" Height="-1" MouseClick="onMouseClick">
 	<HorizontalStack Name="hsTemplateExpander" Spacing="1" Focusable="false" Height="-1" Width="0">
 		<Image Name="Image" Margin="3" Width="16" Height="16" Path="#go.Images.Icons.expandable.svg"/>
 		<Label Name="Caption"/>
diff --git a/Templates/Window.goml b/Templates/Window.goml
new file mode 100755
index 00000000..c7c48b80
--- /dev/null
+++ b/Templates/Window.goml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<Border BorderWidth="1" BorderColor="LightGray"  MouseClick="onMouseClick" Margin="0" Focusable="true">
+	<VerticalStack MouseClick="onMouseClick" Height="0" Width="0" Margin="0" Focusable="true">
+		<Border BorderWidth="1" BorderColor="LightGray"  Height="-1" Width="0" MouseClick="onMouseClick"  Background="BlueCrayola" Focusable="true"
+			MouseMove="Window_MouseMove">
+			<HorizontalStack Margin="0" Spacing="1" Height="-1" Width="0" Focusable="true" MouseMove="Window_MouseMove">
+				<Image Name="Image" Margin="3" Width="16" Height="16" Path="#go.Images.Icons.expandable.svg"/>
+				<Label Focusable="true" Name="Title" MouseMove="Window_MouseMove"/>
+			</HorizontalStack>
+		</Border>
+		<Container Name="Content" Margin="1"/>
+	</VerticalStack>
+</Border>
\ No newline at end of file
diff --git a/Tests/GOLIBTest_4.cs b/Tests/GOLIBTest_4.cs
index 8b1a9bc0..35b2dcff 100644
--- a/Tests/GOLIBTest_4.cs
+++ b/Tests/GOLIBTest_4.cs
@@ -43,18 +43,15 @@ namespace test
 				int oldVal = _fps;
 				_fps = value;
 
-				if (_fps > fpsMax) {
-					fpsMax = _fps;
-					ValueChanged.Raise(this, new ValueChangeEventArgs ("fpsMax", fpsMax, _fps));
-				} else if (_fps < fpsMin) {
-					ValueChanged.Raise(this, new ValueChangeEventArgs ("fpsMin", fpsMin, _fps));
-					fpsMin = _fps;
-				}
-
-				if (ValueChanged != null)
-					ValueChanged.Raise(this, new ValueChangeEventArgs ("fps", oldVal, _fps));
-
-				//ValueChanged.Raise (this, new ValueChangeEventArgs ("fps", oldVal, _fps));
+//				if (_fps > fpsMax) {
+//					fpsMax = _fps;
+//					ValueChanged.Raise(this, new ValueChangeEventArgs ("fpsMax", fpsMax, _fps));
+//				} else if (_fps < fpsMin) {
+//					ValueChanged.Raise(this, new ValueChangeEventArgs ("fpsMin", fpsMin, _fps));
+//					fpsMin = _fps;
+//				}
+//
+				ValueChanged.Raise(this, new ValueChangeEventArgs ("fps", oldVal, _fps));
 			}
 		}
 
diff --git a/Tests/GOLIBTest_Container.cs b/Tests/GOLIBTest_Container.cs
new file mode 100644
index 00000000..79ed43b6
--- /dev/null
+++ b/Tests/GOLIBTest_Container.cs
@@ -0,0 +1,119 @@
+#define MONO_CAIRO_DEBUG_DISPOSE
+
+
+using System;
+using System.Runtime.InteropServices;
+using OpenTK;
+using OpenTK.Graphics.OpenGL;
+using OpenTK.Input;
+
+using System.Diagnostics;
+
+//using GGL;
+using go;
+using System.Threading;
+
+
+namespace test2
+{
+	class GOLIBTest_Container : OpenTKGameWindow , IValueChange
+	{
+		#region FPS
+		int _fps = 0;
+
+		public int fps {
+			get { return _fps; }
+			set {
+				if (_fps == value)
+					return;
+				
+				int oldVal = _fps;
+				_fps = value;
+
+				if (_fps > fpsMax) {
+					fpsMax = _fps;
+					ValueChanged.Raise(this, new ValueChangeEventArgs ("fpsMax", fpsMax, _fps));
+				} else if (_fps < fpsMin) {
+					ValueChanged.Raise(this, new ValueChangeEventArgs ("fpsMin", fpsMin, _fps));
+					fpsMin = _fps;
+				}
+
+				if (ValueChanged != null)
+					ValueChanged.Raise(this, new ValueChangeEventArgs ("fps", oldVal, _fps));
+
+				//ValueChanged.Raise (this, new ValueChangeEventArgs ("fps", oldVal, _fps));
+			}
+		}
+		string name = "testName";
+
+		public string Name {
+			get {
+				return name;
+			}
+			set {
+				name = value;
+			}
+		}
+
+		public int fpsMin = int.MaxValue;
+		public int fpsMax = 0;
+
+		void resetFps ()
+		{
+			fpsMin = int.MaxValue;
+			fpsMax = 0;
+			_fps = 0;
+		}
+		#endregion
+
+		public GOLIBTest_Container ()
+			: base(600, 400,"test")
+		{}
+
+		Container g;
+
+		protected override void OnLoad (EventArgs e)
+		{
+			base.OnLoad (e);
+			LoadInterface("Interfaces/testContainer.goml", out g);
+
+		}
+		protected override void OnRenderFrame (FrameEventArgs e)
+		{
+			GL.Clear (ClearBufferMask.ColorBufferBit);
+			base.OnRenderFrame (e);
+			SwapBuffers ();
+		}
+
+		private int frameCpt = 0;
+		protected override void OnUpdateFrame (FrameEventArgs e)
+		{
+			base.OnUpdateFrame (e);
+
+			fps = (int)RenderFrequency;
+
+			if (frameCpt > 200) {
+				resetFps ();
+				frameCpt = 0;
+
+			}
+			frameCpt++;
+		}
+
+		#region IValueChange implementation
+
+		public event EventHandler<ValueChangeEventArgs> ValueChanged;
+
+		#endregion
+
+		[STAThread]
+		static void Main ()
+		{
+			Console.WriteLine ("starting example");
+
+			using (GOLIBTest_Container win = new GOLIBTest_Container( )) {
+				win.Run (30.0);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/Tests/GOLIBTest_Label.cs b/Tests/GOLIBTest_Label.cs
new file mode 100644
index 00000000..6a3feaad
--- /dev/null
+++ b/Tests/GOLIBTest_Label.cs
@@ -0,0 +1,119 @@
+#define MONO_CAIRO_DEBUG_DISPOSE
+
+
+using System;
+using System.Runtime.InteropServices;
+using OpenTK;
+using OpenTK.Graphics.OpenGL;
+using OpenTK.Input;
+
+using System.Diagnostics;
+
+//using GGL;
+using go;
+using System.Threading;
+
+
+namespace test
+{
+	class GOLIBTest_Label : OpenTKGameWindow , IValueChange
+	{
+		#region FPS
+		int _fps = 0;
+
+		public int fps {
+			get { return _fps; }
+			set {
+				if (_fps == value)
+					return;
+				
+				int oldVal = _fps;
+				_fps = value;
+
+				if (_fps > fpsMax) {
+					fpsMax = _fps;
+					ValueChanged.Raise(this, new ValueChangeEventArgs ("fpsMax", fpsMax, _fps));
+				} else if (_fps < fpsMin) {
+					ValueChanged.Raise(this, new ValueChangeEventArgs ("fpsMin", fpsMin, _fps));
+					fpsMin = _fps;
+				}
+
+				if (ValueChanged != null)
+					ValueChanged.Raise(this, new ValueChangeEventArgs ("fps", oldVal, _fps));
+
+				//ValueChanged.Raise (this, new ValueChangeEventArgs ("fps", oldVal, _fps));
+			}
+		}
+		string name = "testName";
+
+		public string Name {
+			get {
+				return name;
+			}
+			set {
+				name = value;
+			}
+		}
+
+		public int fpsMin = int.MaxValue;
+		public int fpsMax = 0;
+
+		void resetFps ()
+		{
+			fpsMin = int.MaxValue;
+			fpsMax = 0;
+			_fps = 0;
+		}
+		#endregion
+
+		public GOLIBTest_Label ()
+			: base(600, 400,"test")
+		{}
+
+		Label g;
+
+		protected override void OnLoad (EventArgs e)
+		{
+			base.OnLoad (e);
+			LoadInterface("Interfaces/testLabel.goml", out g);
+
+		}
+		protected override void OnRenderFrame (FrameEventArgs e)
+		{
+			GL.Clear (ClearBufferMask.ColorBufferBit);
+			base.OnRenderFrame (e);
+			SwapBuffers ();
+		}
+
+		private int frameCpt = 0;
+		protected override void OnUpdateFrame (FrameEventArgs e)
+		{
+			base.OnUpdateFrame (e);
+
+			fps = (int)RenderFrequency;
+
+			if (frameCpt > 200) {
+				resetFps ();
+				frameCpt = 0;
+
+			}
+			frameCpt++;
+		}
+
+		#region IValueChange implementation
+
+		public event EventHandler<ValueChangeEventArgs> ValueChanged;
+
+		#endregion
+
+		[STAThread]
+		static void Main ()
+		{
+			Console.WriteLine ("starting example");
+
+			using (GOLIBTest_Label win = new GOLIBTest_Label( )) {
+				win.Run (30.0);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/Tests/GOLIBTest_Window.cs b/Tests/GOLIBTest_Window.cs
new file mode 100644
index 00000000..542b3606
--- /dev/null
+++ b/Tests/GOLIBTest_Window.cs
@@ -0,0 +1,119 @@
+#define MONO_CAIRO_DEBUG_DISPOSE
+
+
+using System;
+using System.Runtime.InteropServices;
+using OpenTK;
+using OpenTK.Graphics.OpenGL;
+using OpenTK.Input;
+
+using System.Diagnostics;
+
+//using GGL;
+using go;
+using System.Threading;
+
+
+namespace test
+{
+	class GOLIBTest_Window : OpenTKGameWindow , IValueChange
+	{
+		#region FPS
+		int _fps = 0;
+
+		public int fps {
+			get { return _fps; }
+			set {
+				if (_fps == value)
+					return;
+				
+				int oldVal = _fps;
+				_fps = value;
+
+				if (_fps > fpsMax) {
+					fpsMax = _fps;
+					ValueChanged.Raise(this, new ValueChangeEventArgs ("fpsMax", fpsMax, _fps));
+				} else if (_fps < fpsMin) {
+					ValueChanged.Raise(this, new ValueChangeEventArgs ("fpsMin", fpsMin, _fps));
+					fpsMin = _fps;
+				}
+
+				if (ValueChanged != null)
+					ValueChanged.Raise(this, new ValueChangeEventArgs ("fps", oldVal, _fps));
+
+				//ValueChanged.Raise (this, new ValueChangeEventArgs ("fps", oldVal, _fps));
+			}
+		}
+		string name = "testName";
+
+		public string Name {
+			get {
+				return name;
+			}
+			set {
+				name = value;
+			}
+		}
+
+		public int fpsMin = int.MaxValue;
+		public int fpsMax = 0;
+
+		void resetFps ()
+		{
+			fpsMin = int.MaxValue;
+			fpsMax = 0;
+			_fps = 0;
+		}
+		#endregion
+
+		public GOLIBTest_Window ()
+			: base(600, 400,"test")
+		{}
+
+		Window g;
+
+		protected override void OnLoad (EventArgs e)
+		{
+			base.OnLoad (e);
+			LoadInterface("Interfaces/testWindow.goml", out g);
+
+		}
+		protected override void OnRenderFrame (FrameEventArgs e)
+		{
+			GL.Clear (ClearBufferMask.ColorBufferBit);
+			base.OnRenderFrame (e);
+			SwapBuffers ();
+		}
+
+		private int frameCpt = 0;
+		protected override void OnUpdateFrame (FrameEventArgs e)
+		{
+			base.OnUpdateFrame (e);
+
+			fps = (int)RenderFrequency;
+
+			if (frameCpt > 200) {
+				resetFps ();
+				frameCpt = 0;
+
+			}
+			frameCpt++;
+		}
+
+		#region IValueChange implementation
+
+		public event EventHandler<ValueChangeEventArgs> ValueChanged;
+
+		#endregion
+
+		[STAThread]
+		static void Main ()
+		{
+			Console.WriteLine ("starting example");
+
+			using (GOLIBTest_Window win = new GOLIBTest_Window( )) {
+				win.Run (30.0);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/Tests/Interfaces/test4.goml b/Tests/Interfaces/test4.goml
index 9fd33b7d..4eb5af9a 100755
--- a/Tests/Interfaces/test4.goml
+++ b/Tests/Interfaces/test4.goml
@@ -85,32 +85,13 @@
 				<Slider Height="10" Width="300" BorderWidth="1" Background="Transparent" />
 				<GraduatedSlider Name="slider" Height="30" Width="300" Foreground="BlueBell"/>
 			</VerticalStack>
-			<VerticalStack Width="-1" Height="-1" BorderWidth="1" Margin="5" WidgetSpacing="4">
+			<VerticalStack Width="-1" Height="-1"  Margin="0" WidgetSpacing="1">
 				<Button  Margin="1" Width="150" Height="100">
 					<Image Path="#Tests.image.tetra.png"/>
 				</Button>
-				<Popper>
+				<Popper Width="100">
 					<Image Fit="true" Path="#Tests.image.tetra.png"/>
 				</Popper>
-				<HorizontalStack>
-					<Label Text="Update" FontColor="White"/>
-					<Label Name="labUpdate" Text="xxxx" FontSize="16" Width="60" TextAlignment="Center" Background="DarkGreen"/>
-				</HorizontalStack>
-				<HorizontalStack>
-					<Label Text="Fps:" Width = "30"/>
-					<Label Name="labFps" Text="{fps}" Font="droid bold, 14"
-						TextAlignment="Center" Background="AoEnglish"/>
-				</HorizontalStack>
-				<HorizontalStack>
-					<Label Text="Min:" Width = "30"/>
-					<Label Name="labFpsMin" Text="{fpsMin}" Font="droid bold, 14"
-						TextAlignment="Center" Background="AoEnglish"/>
-				</HorizontalStack>
-				<HorizontalStack>
-					<Label Text="Max:" Width = "30"/>
-					<Label Name="labFpsMax" Text="{fpsMax}" Font="droid bold, 14"
-						TextAlignment="Center" Background="AoEnglish"/>
-				</HorizontalStack>
 				<Expandable Name="expander" Width="150" Height="-1">
 					<VerticalStack Name="vsExpanded" Width="100">
 						<Checkbox Name="chk1"/>
@@ -131,6 +112,25 @@
 						<Checkbox Name="chk2"/>
 					</VerticalStack>		
 				</Expandable>
+				<HorizontalStack>
+					<Label Text="Update" FontColor="White"/>
+					<Label Name="labUpdate" Text="xxxx" FontSize="16" Width="60" TextAlignment="Center" Background="DarkGreen"/>
+				</HorizontalStack>
+				<HorizontalStack>
+					<Label Text="Fps:" Width = "30"/>
+					<Label Name="labFps" Text="{fps}" Font="droid bold, 14"
+						TextAlignment="Center" Background="AoEnglish"/>
+				</HorizontalStack>
+				<HorizontalStack>
+					<Label Text="Min:" Width = "30"/>
+					<Label Name="labFpsMin" Text="{fpsMin}" Font="droid bold, 14"
+						TextAlignment="Center" Background="AoEnglish"/>
+				</HorizontalStack>
+				<HorizontalStack>
+					<Label Text="Max:" Width = "30"/>
+					<Label Name="labFpsMax" Text="{fpsMax}" Font="droid bold, 14"
+						TextAlignment="Center" Background="AoEnglish"/>
+				</HorizontalStack>
 			</VerticalStack>
 
 			<Scroller Background="DimGray" Height="350" Width="150"  
diff --git a/Tests/Interfaces/testContainer.goml b/Tests/Interfaces/testContainer.goml
new file mode 100755
index 00000000..792c87c6
--- /dev/null
+++ b/Tests/Interfaces/testContainer.goml
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<Container Background="Red" Left="100" Top="100" Height="300" Width="300" >
+	<Container Left="100" Top="100" Height="100" Width="100" Background="LightGreen" Margin="0">
+		<Label Text="{fps}"  Background="DarkRed"/>
+	</Container>
+</Container>
diff --git a/Tests/Interfaces/testLabel.goml b/Tests/Interfaces/testLabel.goml
new file mode 100755
index 00000000..a640002a
--- /dev/null
+++ b/Tests/Interfaces/testLabel.goml
@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+				<Label Name="labFps" Text="{fps}" Font="droid bold, 12"
+					TextAlignment="Center" Background="AoEnglish" />
diff --git a/Tests/Interfaces/testWindow.goml b/Tests/Interfaces/testWindow.goml
new file mode 100755
index 00000000..524ff06c
--- /dev/null
+++ b/Tests/Interfaces/testWindow.goml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!--<Group>-->
+<Window Name="window1" Left="10" Top="10" Title="test window" Width="200" Height="200" Background="0,5;0,5;0,5;0,5" >
+	<VerticalStack Height="0" Width="0">
+		<Label Text="{fps}"  Background="DarkRed"/>
+		<Label/>
+		<Label/>
+		<Label/>
+	</VerticalStack>
+</Window>
+<!--</Group>-->
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index 1dab8024..57e19ad4 100644
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -8,7 +8,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>Tests</RootNamespace>
     <AssemblyName>Tests</AssemblyName>
-    <StartupObject>test.GOLIBTest_fps</StartupObject>
+    <StartupObject>test.GOLIBTest_4</StartupObject>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <OutputPath>..\bin\$(configuration)</OutputPath>
     <IntermediateOutputPath>obj\$(configuration)</IntermediateOutputPath>
@@ -57,6 +57,9 @@
     <Compile Include="GOLIBTest_Listbox.cs" />
     <Compile Include="GOLIBTest_Spinner.cs" />
     <Compile Include="GOLIBTest_Expandable.cs" />
+    <Compile Include="GOLIBTest_Label.cs" />
+    <Compile Include="GOLIBTest_Window.cs" />
+    <Compile Include="GOLIBTest_Container.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="image\u.svg">
@@ -107,6 +110,15 @@
     <None Include="Interfaces\testExpandable.goml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="Interfaces\testLabel.goml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Interfaces\testWindow.goml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Interfaces\testContainer.goml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Interfaces\" />
diff --git a/src/GraphicObjects/GenericStack.cs b/src/GraphicObjects/GenericStack.cs
index b703f61b..3b96d548 100644
--- a/src/GraphicObjects/GenericStack.cs
+++ b/src/GraphicObjects/GenericStack.cs
@@ -159,7 +159,7 @@ namespace go
 				}				
 				ComputeChildrenPositions ();
 				//if no layouting remains in queue for item, registre for redraw
-				if (Interface.LayoutingQueue.Where (lq => lq.GraphicObject == this).Count () <= 0)
+				if (Interface.LayoutingQueue.Where (lq => lq.GraphicObject == this).Count () <= 0 && bmp==null)
 					this.RegisterForRedraw ();
 			}else
 				base.UpdateLayout(layoutType);
diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs
index 9cafe13b..2c10a658 100644
--- a/src/GraphicObjects/GraphicObject.cs
+++ b/src/GraphicObjects/GraphicObject.cs
@@ -547,7 +547,7 @@ namespace go
 			}
 
 			//if no layouting remains in queue for item, registre for redraw
-			if (Interface.LayoutingQueue.Where (lq => lq.GraphicObject == this).Count () <= 0)
+			if (Interface.LayoutingQueue.Where (lq => lq.GraphicObject == this).Count () <= 0 && bmp == null)
 				this.RegisterForRedraw ();
 		}
 
diff --git a/src/GraphicObjects/PrivateContainer.cs b/src/GraphicObjects/PrivateContainer.cs
index 23d65c20..cd234d62 100644
--- a/src/GraphicObjects/PrivateContainer.cs
+++ b/src/GraphicObjects/PrivateContainer.cs
@@ -22,6 +22,7 @@ using System;
 using System.Xml.Serialization;
 using System.ComponentModel;
 using OpenTK.Input;
+using Cairo;
 
 namespace go
 {
@@ -118,7 +119,7 @@ namespace go
 		public override Rectangle ContextCoordinates (Rectangle r)
 		{
 			return
-				Parent.ContextCoordinates(r) + getSlot().Position +  ClientRectangle.Position;
+				Parent.ContextCoordinates(r) + Slot.Position + ClientRectangle.Position;
 		}
 		public override void Paint(ref Cairo.Context ctx, Rectangles clip = null)
 		{
@@ -130,6 +131,8 @@ namespace go
 			//			ctx.Rectangle(ContextCoordinates(Slot));
 			//            ctx.Clip();
 			//
+
+
 			if (clip != null)
 				clip.clip(ctx);
 
@@ -147,6 +150,7 @@ namespace go
 
 			ctx.Restore();            
 		}
+
 		#endregion
 
 		#region Mouse handling
diff --git a/src/GraphicObjects/Window.cs b/src/GraphicObjects/Window.cs
index 750478da..61d6fd1f 100644
--- a/src/GraphicObjects/Window.cs
+++ b/src/GraphicObjects/Window.cs
@@ -1,12 +1,59 @@
 using System;
+using System.Xml.Serialization;
+using System.ComponentModel;
+using System.Diagnostics;
+using OpenTK.Input;
 
 namespace go
 {
-	public class Window : Container
+	[DefaultTemplate("#go.Templates.Window.goml")]
+	public class Window : TemplatedContainer
 	{
-		public Window ()
+		Label _title;
+		Image _icon;
+		Container _contentContainer;
+
+		public override GraphicObject Content {
+			get {
+				return _contentContainer == null ? null : _contentContainer.Child;
+			}
+			set {
+				_contentContainer.SetChild(value);
+			}
+		}
+		[XmlAttributeAttribute()][DefaultValue("Window")]
+		public string Title {
+			get { return _title.Text; } 
+			set {
+				if (_title == null)
+					return;
+				_title.Text = value; 
+			}
+		}   
+		public Window () : base()
+		{
+		}
+
+		void Window_MouseMove (object sender, OpenTK.Input.MouseMoveEventArgs e)
 		{
+			if (!e.Mouse.IsButtonDown (MouseButton.Left))
+				return;
+			this.TopContainer.redrawClip.AddRectangle (this.ScreenCoordinates(this.Slot));
+			this.Left += e.XDelta;
+			this.Top += e.YDelta;
+			this.registerForGraphicUpdate ();			
 		}
+
+		protected override void loadTemplate(GraphicObject template = null)
+		{
+			base.loadTemplate (template);
+
+			_contentContainer = this.child.FindByName ("Content") as Container;
+			_title = this.child.FindByName ("Title") as Label;
+			_icon = this.child.FindByName ("Icon") as Image;
+		}
+
+
 	}
 }
 
diff --git a/src/OpenTKGameWindow.cs b/src/OpenTKGameWindow.cs
index 99fba8c5..7299e858 100755
--- a/src/OpenTKGameWindow.cs
+++ b/src/OpenTKGameWindow.cs
@@ -257,7 +257,7 @@ namespace go
 
 							ctx.Save ();
 							if (redrawClip.count > 0) {
-								Rectangles clip = redrawClip.intersectingRects (p.ContextCoordinates(p.Slot.Size));
+								Rectangles clip = redrawClip.intersectingRects (p.Slot);
 
 								if (clip.count > 0)
 									p.Paint (ref ctx, clip);
-- 
2.47.3