From 46bad7bb53e7f9c23f4dac4fb81716272cb71515 Mon Sep 17 00:00:00 2001
From: jpbruyere <jp.bruyere@hotmail.com>
Date: Fri, 12 Feb 2016 13:42:46 +0100
Subject: [PATCH] clipping basics ok for Group and PrivateContainer, problems
 with Templates

---
 Tests/GOLIBTests.cs                    |  2 +-
 Tests/Interfaces/clip0.crow            |  4 ++--
 Tests/Interfaces/clip1.crow            |  4 ++--
 Tests/Interfaces/clip2.crow            |  2 +-
 src/GraphicObjects/GraphicObject.cs    | 10 ++--------
 src/GraphicObjects/Group.cs            | 23 ++++++++++++-----------
 src/GraphicObjects/PrivateContainer.cs |  8 +++++++-
 src/GraphicObjects/TemplatedControl.cs |  5 -----
 src/OpenTKGameWindow.cs                | 10 +++++-----
 9 files changed, 32 insertions(+), 36 deletions(-)

diff --git a/Tests/GOLIBTests.cs b/Tests/GOLIBTests.cs
index c14277f4..622d1ce7 100644
--- a/Tests/GOLIBTests.cs
+++ b/Tests/GOLIBTests.cs
@@ -37,9 +37,9 @@ namespace test
 		int frameCpt = 0;
 		int idx = 0;
 		string[] testFiles = {
+			"clip2.crow",
 			"clip0.crow",
 			"clip1.crow",
-			"clip2.crow",
 			"0.crow",
 			"5.crow",
 			"testCombobox.goml",
diff --git a/Tests/Interfaces/clip0.crow b/Tests/Interfaces/clip0.crow
index dbe6eb34..2ebea9ff 100755
--- a/Tests/Interfaces/clip0.crow
+++ b/Tests/Interfaces/clip0.crow
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
-<Container Fit="true" Margin="50" Background="LimeGreen" CacheEnabled="true"
+<Container Fit="true" Margin="50" Background="LimeGreen" CacheEnabled="false"
 		HorizontalAlignment="Right" VerticalAlignment="Bottom"
 		MouseEnter="{Background=Gray}"
 		MouseLeave="{Background=LimeGreen}">
-	<Label HorizontalAlignment="Center" VerticalAlignment="Center" CacheEnabled="true"
+	<Label HorizontalAlignment="Center" VerticalAlignment="Center" CacheEnabled="false"
 		MouseEnter="{Background=DimGray}" Width="100"
 		MouseLeave="{Background=BlueCrayola}"
 	 	Margin="10" Text="{drawing}" Background="BlueCrayola"/>
diff --git a/Tests/Interfaces/clip1.crow b/Tests/Interfaces/clip1.crow
index d5fcf79b..4aeb7fde 100755
--- a/Tests/Interfaces/clip1.crow
+++ b/Tests/Interfaces/clip1.crow
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
-<Container Fit="true" Margin="20" Background="SkyBlue" CacheEnabled="true"
+<Container Fit="true" Margin="20" Background="SkyBlue" CacheEnabled="false"
 		HorizontalAlignment="Right" VerticalAlignment="Bottom"
 		MouseEnter="{Background=LightGray}"
 		MouseLeave="{Background=SkyBlue}">
-		<Container Fit="true" Margin="20" Background="Red" CacheEnabled="false"
+		<Container Fit="true" Margin="20" Background="Red" CacheEnabled="true"
 			HorizontalAlignment="Right" VerticalAlignment="Bottom"
 			MouseEnter="{Background=White}"
 			MouseLeave="{Background=Red}">
diff --git a/Tests/Interfaces/clip2.crow b/Tests/Interfaces/clip2.crow
index 8f6b4656..8ab66910 100755
--- a/Tests/Interfaces/clip2.crow
+++ b/Tests/Interfaces/clip2.crow
@@ -7,7 +7,7 @@
 		HorizontalAlignment="Right" VerticalAlignment="Bottom"
 		MouseEnter="{Background=Gray}"
 		MouseLeave="{Background=LimeGreen}">
-	<Label HorizontalAlignment="Center" VerticalAlignment="Center" CacheEnabled="false"
+	<Label HorizontalAlignment="Center" VerticalAlignment="Center" CacheEnabled="true"
 		MouseEnter="{Background=DimGray}" Width="100"
 		MouseLeave="{Background=BlueCrayola}"
 	 	Margin="10" Text="{drawing}" Background="BlueCrayola"/>
diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs
index 97e4eccf..7cb4a723 100644
--- a/src/GraphicObjects/GraphicObject.cs
+++ b/src/GraphicObjects/GraphicObject.cs
@@ -473,8 +473,8 @@ namespace Crow
 		}
 		public void RegisterClip(Rectangle clip){			
 			if (CacheEnabled && bmp != null)
-				Clipping.AddRectangle (clip);				
-			Parent.RegisterClip (clip + Slot.Position + Parent.ClientRectangle.Position);
+				Clipping.AddRectangle (clip + ClientRectangle.Position);
+			Parent.RegisterClip (clip + Slot.Position + ClientRectangle.Position);
 		}
 //		public virtual void registerClipRect(Rectangle clip)
 //		{
@@ -502,12 +502,6 @@ namespace Crow
 		{
 			if (IsQueuedForRedraw)
 				return;
-			//test if this speed up a lot to cancel clipping for an uncached group
-			Group p = Parent as Group;
-			if (p != null) {
-				if (p.bmp == null)
-					return;
-			}
 			if (HostContainer == null)
 				return;
 			HostContainer.gobjsToRedraw.Add (this);
diff --git a/src/GraphicObjects/Group.cs b/src/GraphicObjects/Group.cs
index efc5240b..a2bc4634 100644
--- a/src/GraphicObjects/Group.cs
+++ b/src/GraphicObjects/Group.cs
@@ -220,19 +220,20 @@ namespace Crow
 			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) {
+					Clipping.clearAndClip (gr);
+					base.onDraw (gr);
 
-				foreach (GraphicObject c in children) {
-					if (!c.Visible)
-						continue;
-					c.Paint (ref gr);						
-				}
-
-				#if DEBUG_CLIP_RECTANGLE
-				Clipping.stroke (gr, Color.Amaranth.AdjustAlpha (0.8));
-				#endif
+					foreach (GraphicObject c in children) {
+						if (!c.Visible)
+							continue;
+						c.Paint (ref gr);						
+					}
 
+					#if DEBUG_CLIP_RECTANGLE
+					Clipping.stroke (gr, Color.Amaranth.AdjustAlpha (0.8));
+					#endif
+				}
 				gr.Dispose ();
 
 				ctx.SetSourceSurface (cache, rb.X, rb.Y);
diff --git a/src/GraphicObjects/PrivateContainer.cs b/src/GraphicObjects/PrivateContainer.cs
index 4012a7af..d3a70649 100644
--- a/src/GraphicObjects/PrivateContainer.cs
+++ b/src/GraphicObjects/PrivateContainer.cs
@@ -141,14 +141,18 @@ namespace Crow
 		}
 		protected override void UpdateCache (Context ctx)
 		{
+			//ctx.Save ();
+
 			Rectangle rb = Slot + Parent.ClientRectangle.Position;
 
 			using (ImageSurface cache = new ImageSurface (bmp, Format.Argb32, Slot.Width, Slot.Height, 4 * Slot.Width)) {
 				Context gr = new Context (cache);
 
-				//Clipping.clearAndClip (ctx);
 
 				if (Clipping.count > 0) {
+
+					Clipping.clearAndClip (gr);
+
 					if (child != null) {
 						
 						base.onDraw (gr);
@@ -163,6 +167,8 @@ namespace Crow
 				ctx.Paint ();
 			}
 			Clipping.Reset();
+
+			//ctx.Restore ();
 		}
 //		public override Rectangle ContextCoordinates (Rectangle r)
 //		{
diff --git a/src/GraphicObjects/TemplatedControl.cs b/src/GraphicObjects/TemplatedControl.cs
index 9dacd466..50199f7a 100644
--- a/src/GraphicObjects/TemplatedControl.cs
+++ b/src/GraphicObjects/TemplatedControl.cs
@@ -93,11 +93,6 @@ namespace Crow
 					NotifyValueChanged ("TemplatedHeight", 0);
 			}
 		}
-
-		protected override void loadDefaultValues ()
-		{			
-			base.loadDefaultValues ();
-		}
 		public override GraphicObject FindByName (string nameToFind)
 		{
 			//prevent name searching in template
diff --git a/src/OpenTKGameWindow.cs b/src/OpenTKGameWindow.cs
index 5a2dc7fe..c46a07f7 100644
--- a/src/OpenTKGameWindow.cs
+++ b/src/OpenTKGameWindow.cs
@@ -279,8 +279,8 @@ namespace Crow
 			gobjsToRedraw.Clear ();
 			foreach (GraphicObject p in gotr) {
 				p.IsQueuedForRedraw = false;
-				p.RegisterClip (p.LastPaintedSlot);
-				p.RegisterClip (p.getSlot());
+				p.Parent.RegisterClip (p.LastPaintedSlot);
+				p.Parent.RegisterClip (p.getSlot());
 			}
 
 			#if MEASURE_TIME
@@ -307,9 +307,9 @@ namespace Crow
 							ctx.Restore ();
 						}
 
-						#if DEBUG_CLIP_RECTANGLE
-						clipping.stroke (ctx, Color.Red.AdjustAlpha(0.5));
-						#endif
+//						#if DEBUG_CLIP_RECTANGLE
+//						clipping.stroke (ctx, Color.Red.AdjustAlpha(0.5));
+//						#endif
 
 						clipping.Reset ();
 					}
-- 
2.47.3