From a823099f5db40fb8b2cbe79179185db5266e01e3 Mon Sep 17 00:00:00 2001
From: jpbruyere <jp.bruyere@hotmail.com>
Date: Fri, 12 Feb 2016 11:52:50 +0100
Subject: [PATCH] separate RecreateCache and UpdateCache

---
 Tests/GOLIBTests.cs                    |  1 +
 Tests/Interfaces/clip1.crow            |  6 +--
 Tests/Interfaces/clip2.crow            | 10 +++++
 Tests/Tests.csproj                     |  3 ++
 src/GraphicObjects/GraphicObject.cs    |  2 +-
 src/GraphicObjects/Group.cs            | 53 +++++++++-----------------
 src/GraphicObjects/PrivateContainer.cs |  2 +-
 src/OpenTKGameWindow.cs                | 34 +++++------------
 8 files changed, 47 insertions(+), 64 deletions(-)
 create mode 100755 Tests/Interfaces/clip2.crow

diff --git a/Tests/GOLIBTests.cs b/Tests/GOLIBTests.cs
index adc61818..622d1ce7 100644
--- a/Tests/GOLIBTests.cs
+++ b/Tests/GOLIBTests.cs
@@ -37,6 +37,7 @@ namespace test
 		int frameCpt = 0;
 		int idx = 0;
 		string[] testFiles = {
+			"clip2.crow",
 			"clip0.crow",
 			"clip1.crow",
 			"0.crow",
diff --git a/Tests/Interfaces/clip1.crow b/Tests/Interfaces/clip1.crow
index 957080b9..d5fcf79b 100755
--- a/Tests/Interfaces/clip1.crow
+++ b/Tests/Interfaces/clip1.crow
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<Container Fit="true" Margin="20" Background="SkyBlue" CacheEnabled="false"
+<Container Fit="true" Margin="20" Background="SkyBlue" CacheEnabled="true"
 		HorizontalAlignment="Right" VerticalAlignment="Bottom"
 		MouseEnter="{Background=LightGray}"
 		MouseLeave="{Background=SkyBlue}">
@@ -11,11 +11,11 @@
 				HorizontalAlignment="Right" VerticalAlignment="Bottom"
 				MouseEnter="{Background=Blue}"
 				MouseLeave="{Background=Yellow}">
-				<Container Width="200" Height="200" Margin="0" Background="LimeGreen" CacheEnabled="false"
+				<Container Margin="50" Background="LimeGreen" CacheEnabled="true"
 						HorizontalAlignment="Right" VerticalAlignment="Bottom"
 						MouseEnter="{Background=Gray}"
 						MouseLeave="{Background=LimeGreen}">
-					<Label Left="30"  HorizontalAlignment="Center" VerticalAlignment="Center" CacheEnabled="false"
+					<Label HorizontalAlignment="Center" VerticalAlignment="Center" CacheEnabled="true"
 						MouseEnter="{Background=DimGray}"
 						MouseLeave="{Background=BlueCrayola}" 
 					 	Margin="1" Text="{drawing}" Background="BlueCrayola"/>
diff --git a/Tests/Interfaces/clip2.crow b/Tests/Interfaces/clip2.crow
new file mode 100755
index 00000000..62295100
--- /dev/null
+++ b/Tests/Interfaces/clip2.crow
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<Group Fit="true" Margin="50" Background="LimeGreen" CacheEnabled="true"
+		HorizontalAlignment="Right" VerticalAlignment="Bottom"
+		MouseEnter="{Background=Gray}"
+		MouseLeave="{Background=LimeGreen}">
+	<Label HorizontalAlignment="Center" VerticalAlignment="Center" CacheEnabled="true"
+		MouseEnter="{Background=DimGray}" Width="100"
+		MouseLeave="{Background=BlueCrayola}"
+	 	Margin="10" Text="{drawing}" Background="BlueCrayola"/>
+ </Group>
\ No newline at end of file
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index 0fe3ffa1..d1e17109 100644
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -230,6 +230,9 @@
     <None Include="Interfaces\clip1.crow">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="Interfaces\clip2.crow">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Interfaces\" />
diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs
index 763d1277..87ac0eef 100644
--- a/src/GraphicObjects/GraphicObject.cs
+++ b/src/GraphicObjects/GraphicObject.cs
@@ -793,7 +793,7 @@ namespace Crow
 				Rectangle rb = Slot + Parent.ClientRectangle.Position;
 				ctx.Save ();
 
-				Clipping.clearAndClip (ctx);
+				//Clipping.clearAndClip (ctx);
 				ctx.Translate (rb.X, rb.Y);
 
 				onDraw (ctx);
diff --git a/src/GraphicObjects/Group.cs b/src/GraphicObjects/Group.cs
index 33fe006d..4305a665 100644
--- a/src/GraphicObjects/Group.cs
+++ b/src/GraphicObjects/Group.cs
@@ -204,9 +204,6 @@ namespace Crow
 				break;
 			}
 		}
-		public override Rectangle ContextCoordinates(Rectangle r){
-			return r + ClientRectangle.Position;
-		}	
 
 		protected override void onDraw (Context gr)
 		{
@@ -216,43 +213,31 @@ namespace Crow
 				g.Paint (ref gr);
 			}
 		}
-
-		public override void Paint(ref Context ctx)
+		protected override void UpdateCache (Context ctx)
 		{
-			if ( !Visible )
-				return;
+			Rectangle rb = Slot + Parent.ClientRectangle.Position;
 
-			if (CacheEnabled) {
-				if (bmp == null)
-					RecreateCache ();
-			}
+			using (ImageSurface cache = new ImageSurface (bmp, Format.Argb32, Slot.Width, Slot.Height, 4 * Slot.Width)) {
+				Context gr = new Context (cache);
+
+				//Clipping.clearAndClip (gr);
+				base.onDraw (gr);
 
-			if (Clipping.count > 0) {
-				using (ImageSurface cache =
-					       new ImageSurface (bmp, Format.Argb32, Slot.Width, Slot.Height, Slot.Width * 4)) {
-					Context gr = new Context (cache);
+				foreach (GraphicObject c in children) {
+					if (!c.Visible)
+						continue;
+					c.Paint (ref gr);						
+				}
 
-					Clipping.clearAndClip (gr);
-					Rectangle rBack = Slot.Size;
-					Background.SetAsSource (gr, rBack);
-					CairoHelpers.CairoRectangle (gr, rBack, CornerRadius);
-					gr.Fill ();
+				#if DEBUG_CLIP_RECTANGLE
+				Clipping.stroke (gr, Color.Amaranth.AdjustAlpha (0.8));
+				#endif
 
-					foreach (GraphicObject c in children) {
-						if (!c.Visible)
-							continue;
-						Rectangles childClip = Clipping.intersectingRects (ContextCoordinates (c.Slot));
-						if (childClip.count > 0)
-							c.Paint (ref ctx);						
-					}
-					#if DEBUG_CLIP_RECTANGLE
-					Clipping.stroke (gr, Color.Amaranth.AdjustAlpha (0.8));
-					#endif
+				gr.Dispose ();
 
-					gr.Dispose ();
-				}
-			}				
-			base.Paint (ref ctx);
+				ctx.SetSourceSurface (cache, rb.X, rb.Y);
+				ctx.Paint ();
+			}
 		}
 		#endregion
 
diff --git a/src/GraphicObjects/PrivateContainer.cs b/src/GraphicObjects/PrivateContainer.cs
index f3a512d0..0a87d03c 100644
--- a/src/GraphicObjects/PrivateContainer.cs
+++ b/src/GraphicObjects/PrivateContainer.cs
@@ -146,7 +146,7 @@ namespace Crow
 			using (ImageSurface cache = new ImageSurface (bmp, Format.Argb32, Slot.Width, Slot.Height, 4 * Slot.Width)) {
 				Context gr = new Context (cache);
 
-				child.Clipping.clearAndClip (gr);
+				//Clipping.clearAndClip (gr);
 				base.onDraw (gr);
 
 				if (Clipping.count > 0) {
diff --git a/src/OpenTKGameWindow.cs b/src/OpenTKGameWindow.cs
index e6fc9681..007556bc 100644
--- a/src/OpenTKGameWindow.cs
+++ b/src/OpenTKGameWindow.cs
@@ -290,36 +290,20 @@ namespace Crow
 					updateTime.Stop ();
 					drawingTime.Start ();
 					#endif
-					Debug.WriteLine (redrawClip.ToString ());
-					lock (redrawClip) {
-						if (redrawClip.count > 0) {
-							#if DEBUG_CLIP_RECTANGLE
-						redrawClip.stroke (ctx, new Color(1.0,0,0,0.3));
-							#endif
-							redrawClip.clearAndClip (ctx);
 
-							//Link.draw (ctx);
-							foreach (GraphicObject p in invGOList) {
-								if (!p.Visible)
-									continue;
-
-								ctx.Save ();
 
-								Rectangles clip = redrawClip.intersectingRects (p.Slot);
+							//Link.draw (ctx);
+					foreach (GraphicObject p in invGOList) {
+						if (!p.Visible)
+							continue;
 
-								if (clip.count > 0)
-									p.Paint (ref ctx);
-								
-								ctx.Restore ();
+						ctx.Save ();
 
-							}
-							ctx.ResetClip ();
-							#if DEBUG_CLIP_RECTANGLE
-						redrawClip.stroke (ctx, Color.Red.AdjustAlpha(0.1));
-							#endif
-							redrawClip.Reset ();
-						}
+						p.Paint (ref ctx);
+						
+						ctx.Restore ();
 					}
+
 					#if MEASURE_TIME
 					drawingTime.Stop ();
 					#endif
-- 
2.47.3