From 0f813f1c3d1bc3e4deeee089d771eb0443949e3f Mon Sep 17 00:00:00 2001
From: jpbruyere <jp.bruyere@hotmail.com>
Date: Thu, 11 Feb 2016 17:01:00 +0100
Subject: temp save to make test in master

---
 src/OpenTKGameWindow.cs | 46 ++++++++++++++++++++--------------------------
 1 file changed, 20 insertions(+), 26 deletions(-)

(limited to 'src/OpenTKGameWindow.cs')

diff --git a/src/OpenTKGameWindow.cs b/src/OpenTKGameWindow.cs
index 16362c6c..e6fc9681 100644
--- a/src/OpenTKGameWindow.cs
+++ b/src/OpenTKGameWindow.cs
@@ -90,7 +90,7 @@ namespace Crow
 			{
 				GraphicObjects.Remove(g);
 				GraphicObjects.Insert(0, g);
-				g.registerClipRect ();
+				//g.registerClipRect ();
 			}
 		}
 		public void Quit ()
@@ -282,14 +282,15 @@ namespace Crow
 					gobjsToRedraw.Clear ();
 					foreach (GraphicObject p in gotr) {
 						p.IsQueuedForRedraw = false;
-						p.registerClipRect ();
+						p.RegisterClip (p.LastPaintedSlot);
+						p.RegisterClip (p.getSlot());
 					}
 
 					#if MEASURE_TIME
 					updateTime.Stop ();
 					drawingTime.Start ();
 					#endif
-
+					Debug.WriteLine (redrawClip.ToString ());
 					lock (redrawClip) {
 						if (redrawClip.count > 0) {
 							#if DEBUG_CLIP_RECTANGLE
@@ -299,17 +300,18 @@ namespace Crow
 
 							//Link.draw (ctx);
 							foreach (GraphicObject p in invGOList) {
-								if (p.Visible) {
+								if (!p.Visible)
+									continue;
+
+								ctx.Save ();
+
+								Rectangles clip = redrawClip.intersectingRects (p.Slot);
 
-									ctx.Save ();
-									if (redrawClip.count > 0) {
-										Rectangles clip = redrawClip.intersectingRects (p.Slot);
+								if (clip.count > 0)
+									p.Paint (ref ctx);
+								
+								ctx.Restore ();
 
-										if (clip.count > 0)
-											p.Paint (ref ctx, clip);
-									}
-									ctx.Restore ();
-								}
 							}
 							ctx.ResetClip ();
 							#if DEBUG_CLIP_RECTANGLE
@@ -549,6 +551,9 @@ namespace Crow
         #endregion
 
 		#region ILayoutable implementation
+		public void RegisterClip(Rectangle r){
+			redrawClip.AddRectangle (r);
+		}
 		public int LayoutingTries {
 			get { throw new NotImplementedException (); }
 			set { throw new NotImplementedException (); }
@@ -559,17 +564,13 @@ namespace Crow
 		}
 		public void RegisterForLayouting (LayoutingType layoutType) { throw new NotImplementedException (); }
 		public bool UpdateLayout (LayoutingType layoutType) { throw new NotImplementedException (); }
-		public Rectangle ContextCoordinates (Rectangle r)
-		{
-			return r;
-		}
+		public Rectangle ContextCoordinates (Rectangle r) => r;
 		public Rectangle ScreenCoordinates (Rectangle r) => r;
 
 		public ILayoutable Parent {
 			get { return null; }
 			set { throw new NotImplementedException (); }
 		}
-
 		public ILayoutable LogicalParent {
 			get { return null; }
 			set { throw new NotImplementedException (); }
@@ -581,15 +582,8 @@ namespace Crow
 		public IGOLibHost HostContainer {
 			get { return this; }
 		}
-
-		public Rectangle getSlot ()
-		{
-			return ClientRectangle;
-		}
-		public Rectangle getBounds ()//redundant but fill ILayoutable implementation
-		{
-			return ClientRectangle;
-		}			
+		public Rectangle getSlot () => ClientRectangle;
+		public Rectangle getBounds () => ClientRectangle;
 		#endregion
     }
 }
\ No newline at end of file
-- 
cgit v1.3.1-4-g156e


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: 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

(limited to 'src/OpenTKGameWindow.cs')

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
-- 
cgit v1.3.1-4-g156e


From f1f143775245695a0aaa8cd2538d3b3382f9ea56 Mon Sep 17 00:00:00 2001
From: jpbruyere <jp.bruyere@hotmail.com>
Date: Fri, 12 Feb 2016 13:05:32 +0100
Subject: testing clipping rect registration, clear and clip, not working

---
 Tests/GOLIBTest_4.cs                   |  2 +-
 Tests/GOLIBTests.cs                    |  2 +-
 Tests/Interfaces/clip0.crow            |  4 +-
 Tests/Interfaces/clip2.crow            |  9 +++-
 src/GraphicObjects/GraphicObject.cs    | 16 +++---
 src/GraphicObjects/Group.cs            |  1 +
 src/GraphicObjects/IGOLibHost.cs       |  1 -
 src/GraphicObjects/PrivateContainer.cs |  7 ++-
 src/OpenTKGameWindow.cs                | 92 +++++++++++++++++++---------------
 9 files changed, 76 insertions(+), 58 deletions(-)

(limited to 'src/OpenTKGameWindow.cs')

diff --git a/Tests/GOLIBTest_4.cs b/Tests/GOLIBTest_4.cs
index 8fbfe4ec..9c8fe385 100644
--- a/Tests/GOLIBTest_4.cs
+++ b/Tests/GOLIBTest_4.cs
@@ -171,7 +171,7 @@ namespace test
 		{
 			if (!e.Mouse.IsButtonDown (MouseButton.Left)||sender!=c)
 				return;
-			redrawClip.AddRectangle (c.ScreenCoordinates(c.Slot));
+			clipping.AddRectangle (c.ScreenCoordinates(c.Slot));
 			c.Left += e.XDelta;
 			c.Top += e.YDelta;
 			c.registerForGraphicUpdate ();
diff --git a/Tests/GOLIBTests.cs b/Tests/GOLIBTests.cs
index 622d1ce7..c14277f4 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 2ebea9ff..dbe6eb34 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="false"
+<Container Fit="true" Margin="50" Background="LimeGreen" CacheEnabled="true"
 		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/Tests/Interfaces/clip2.crow b/Tests/Interfaces/clip2.crow
index 62295100..8f6b4656 100755
--- a/Tests/Interfaces/clip2.crow
+++ b/Tests/Interfaces/clip2.crow
@@ -1,10 +1,15 @@
 <?xml version="1.0"?>
-<Group Fit="true" Margin="50" Background="LimeGreen" CacheEnabled="true"
+<Group Fit="true" Margin="50" Background="Yellow" CacheEnabled="true"
+		HorizontalAlignment="Right" VerticalAlignment="Bottom"
+		MouseEnter="{Background=DimGray}"
+		MouseLeave="{Background=Yellow}">
+<Group 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"/>
+ </Group>
  </Group>
\ No newline at end of file
diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs
index 87ac0eef..97e4eccf 100644
--- a/src/GraphicObjects/GraphicObject.cs
+++ b/src/GraphicObjects/GraphicObject.cs
@@ -31,8 +31,8 @@ namespace Crow
 		internal List<Binding> Bindings = new List<Binding> ();
 		internal int layoutingTries = 0;
 
-		Rectangles _clipping = new Rectangles();
-		public Rectangles Clipping { get { return _clipping; }}
+		Rectangles clipping = new Rectangles();
+		public Rectangles Clipping { get { return clipping; }}
 
 		#region IValueChange implementation
 		public event EventHandler<ValueChangeEventArgs> ValueChanged;
@@ -471,11 +471,10 @@ namespace Crow
 		public virtual bool Contains(GraphicObject goToFind){
 			return false;
 		}
-		public void RegisterClip(Rectangle clip){
-			Rectangle r = Slot + Parent.ClientRectangle;
+		public void RegisterClip(Rectangle clip){			
 			if (CacheEnabled && bmp != null)
-				Clipping.AddRectangle (r);				
-			Parent.RegisterClip (r);
+				Clipping.AddRectangle (clip);				
+			Parent.RegisterClip (clip + Slot.Position + Parent.ClientRectangle.Position);
 		}
 //		public virtual void registerClipRect(Rectangle clip)
 //		{
@@ -768,7 +767,9 @@ namespace Crow
 				//					}
 				ctx.SetSourceSurface (cache, rb.X, rb.Y);
 				ctx.Paint ();
-			}						
+			}
+			//Clipping.clearAndClip (ctx);
+			Clipping.Reset();
 		}
 		/// <summary> Chained painting routine on the parent context of the actual cached version
 		/// of the widget </summary>
@@ -793,7 +794,6 @@ namespace Crow
 				Rectangle rb = Slot + Parent.ClientRectangle.Position;
 				ctx.Save ();
 
-				//Clipping.clearAndClip (ctx);
 				ctx.Translate (rb.X, rb.Y);
 
 				onDraw (ctx);
diff --git a/src/GraphicObjects/Group.cs b/src/GraphicObjects/Group.cs
index 4305a665..efc5240b 100644
--- a/src/GraphicObjects/Group.cs
+++ b/src/GraphicObjects/Group.cs
@@ -238,6 +238,7 @@ namespace Crow
 				ctx.SetSourceSurface (cache, rb.X, rb.Y);
 				ctx.Paint ();
 			}
+			Clipping.Reset();
 		}
 		#endregion
 
diff --git a/src/GraphicObjects/IGOLibHost.cs b/src/GraphicObjects/IGOLibHost.cs
index 1c50d558..1cf6978c 100644
--- a/src/GraphicObjects/IGOLibHost.cs
+++ b/src/GraphicObjects/IGOLibHost.cs
@@ -5,7 +5,6 @@ namespace Crow
 {
 	public interface IGOLibHost
 	{
-		Rectangles redrawClip { get; set; }
 		List<GraphicObject> gobjsToRedraw { get; }
 		GraphicObject activeWidget { get; set; }
 		GraphicObject hoverWidget { get; set; }
diff --git a/src/GraphicObjects/PrivateContainer.cs b/src/GraphicObjects/PrivateContainer.cs
index 0a87d03c..4012a7af 100644
--- a/src/GraphicObjects/PrivateContainer.cs
+++ b/src/GraphicObjects/PrivateContainer.cs
@@ -146,11 +146,13 @@ 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);
+				//Clipping.clearAndClip (ctx);
 
 				if (Clipping.count > 0) {
 					if (child != null) {
+						
+						base.onDraw (gr);
+
 						child.Paint (ref gr);
 					}
 				}
@@ -160,6 +162,7 @@ namespace Crow
 				ctx.SetSourceSurface (cache, rb.X, rb.Y);
 				ctx.Paint ();
 			}
+			Clipping.Reset();
 		}
 //		public override Rectangle ContextCoordinates (Rectangle r)
 //		{
diff --git a/src/OpenTKGameWindow.cs b/src/OpenTKGameWindow.cs
index 007556bc..5a2dc7fe 100644
--- a/src/OpenTKGameWindow.cs
+++ b/src/OpenTKGameWindow.cs
@@ -54,7 +54,7 @@ namespace Crow
 		List<GraphicObject> _gobjsToRedraw = new List<GraphicObject>();
 
 		#region IGOLibHost implementation
-		public Rectangles redrawClip {
+		public Rectangles clipping {
 			get {
 				return _redrawClip;
 			}
@@ -181,7 +181,7 @@ namespace Crow
 			shader.ProjectionMatrix = Matrix4.CreateOrthographicOffCenter 
 				(0, ClientRectangle.Width, ClientRectangle.Height, 0, 0, 1);			
 
-			redrawClip.AddRectangle (ClientRectangle);
+			clipping.AddRectangle (ClientRectangle);
 		}
 		void createOpenGLSurface()
 		{
@@ -253,55 +253,65 @@ namespace Crow
 			updateTime.Restart ();			
 			#endif
 
-			using (surf = new ImageSurface (bmp, Format.Argb32, ClientRectangle.Width, ClientRectangle.Height, ClientRectangle.Width * 4)) {
-				using (ctx = new Context (surf)){
+			GraphicObject[] invGOList = new GraphicObject[GraphicObjects.Count];
+			GraphicObjects.CopyTo (invGOList, 0);
+			invGOList = invGOList.Reverse ().ToArray ();
 
-					GraphicObject[] invGOList = new GraphicObject[GraphicObjects.Count];
-					GraphicObjects.CopyTo (invGOList, 0);
-					invGOList = invGOList.Reverse ().ToArray ();
+			#if MEASURE_TIME
+			layoutTime.Start ();
+			#endif
+			//Debug.WriteLine ("======= Layouting queue start =======");
 
-					#if MEASURE_TIME
-					layoutTime.Start ();
-					#endif
-					//Debug.WriteLine ("======= Layouting queue start =======");
+			while (Interface.LayoutingQueue.Count > 0) {
+				LayoutingQueueItem lqi = Interface.LayoutingQueue.Dequeue ();
+				lqi.ProcessLayouting ();
+			}
 
-					while (Interface.LayoutingQueue.Count > 0) {
-						LayoutingQueueItem lqi = Interface.LayoutingQueue.Dequeue ();
-						lqi.ProcessLayouting ();
-					}
+			#if MEASURE_TIME
+			layoutTime.Stop ();
+			#endif
 
-					#if MEASURE_TIME
-					layoutTime.Stop ();
-					#endif
+			//Debug.WriteLine ("otd:" + gobjsToRedraw.Count.ToString () + "-");
+			//final redraw clips should be added only when layout is completed among parents,
+			//that's why it take place in a second pass
+			GraphicObject[] gotr = new GraphicObject[gobjsToRedraw.Count];
+			gobjsToRedraw.CopyTo (gotr);
+			gobjsToRedraw.Clear ();
+			foreach (GraphicObject p in gotr) {
+				p.IsQueuedForRedraw = false;
+				p.RegisterClip (p.LastPaintedSlot);
+				p.RegisterClip (p.getSlot());
+			}
 
-					//Debug.WriteLine ("otd:" + gobjsToRedraw.Count.ToString () + "-");
-					//final redraw clips should be added only when layout is completed among parents,
-					//that's why it take place in a second pass
-					GraphicObject[] gotr = new GraphicObject[gobjsToRedraw.Count];
-					gobjsToRedraw.CopyTo (gotr);
-					gobjsToRedraw.Clear ();
-					foreach (GraphicObject p in gotr) {
-						p.IsQueuedForRedraw = false;
-						p.RegisterClip (p.LastPaintedSlot);
-						p.RegisterClip (p.getSlot());
-					}
+			#if MEASURE_TIME
+			updateTime.Stop ();
+			drawingTime.Start ();
+			#endif
+
+			using (surf = new ImageSurface (bmp, Format.Argb32, ClientRectangle.Width, ClientRectangle.Height, ClientRectangle.Width * 4)) {
+				using (ctx = new Context (surf)){
 
-					#if MEASURE_TIME
-					updateTime.Stop ();
-					drawingTime.Start ();
-					#endif
 
+					if (clipping.count > 0) {
+						//Link.draw (ctx);
+						clipping.clearAndClip(ctx);
 
-							//Link.draw (ctx);
-					foreach (GraphicObject p in invGOList) {
-						if (!p.Visible)
-							continue;
+						foreach (GraphicObject p in invGOList) {
+							if (!p.Visible)
+								continue;
 
-						ctx.Save ();
+							ctx.Save ();
 
-						p.Paint (ref ctx);
+							p.Paint (ref ctx);
 						
-						ctx.Restore ();
+							ctx.Restore ();
+						}
+
+						#if DEBUG_CLIP_RECTANGLE
+						clipping.stroke (ctx, Color.Red.AdjustAlpha(0.5));
+						#endif
+
+						clipping.Reset ();
 					}
 
 					#if MEASURE_TIME
@@ -536,7 +546,7 @@ namespace Crow
 
 		#region ILayoutable implementation
 		public void RegisterClip(Rectangle r){
-			redrawClip.AddRectangle (r);
+			clipping.AddRectangle (r);
 		}
 		public int LayoutingTries {
 			get { throw new NotImplementedException (); }
-- 
cgit v1.3.1-4-g156e


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: 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(-)

(limited to 'src/OpenTKGameWindow.cs')

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 ();
 					}
-- 
cgit v1.3.1-4-g156e