From: jpbruyere <jp.bruyere@hotmail.com>
Date: Fri, 12 Feb 2016 13:47:49 +0000 (+0100)
Subject: add clipping to client zone with corner radius
X-Git-Tag: 0.3~6^2~1
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=91755561f57c669423539f0336287e2bee36be5e;p=jp%2Fcrow.git

add clipping to client zone with corner radius
---

diff --git a/Crow.csproj b/Crow.csproj
index 9ae27230..64eab6c9 100644
--- a/Crow.csproj
+++ b/Crow.csproj
@@ -46,7 +46,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG_LAYOUTING0;TRACE;DEBUG;__linux__;MEASURE_TIME;DEBUG_LOAD_TIME0;DEBUG_BINDING0;DEBUG_CLIP_RECTANGLE</DefineConstants>
+    <DefineConstants>DEBUG_LAYOUTING0;TRACE;DEBUG;__linux__;MEASURE_TIME;DEBUG_LOAD_TIME0;DEBUG_BINDING0;DEBUG_CLIP_RECTANGLE0</DefineConstants>
   </PropertyGroup>
   <!--  <PropertyGroup Condition=" '$(Platform)' == 'Linux_x86' ">
     <DefineConstants>__linux__</DefineConstants>
diff --git a/Tests/GOLIBTests.cs b/Tests/GOLIBTests.cs
index 1fb98c18..b87bfe75 100644
--- a/Tests/GOLIBTests.cs
+++ b/Tests/GOLIBTests.cs
@@ -37,6 +37,7 @@ namespace test
 		int frameCpt = 0;
 		int idx = 0;
 		string[] testFiles = {
+			"testWindow.goml",
 			"clip4.crow",
 			"clip3.crow",
 			"clip2.crow",
@@ -69,7 +70,6 @@ namespace test
 			"testWindow2.goml",
 
 			"testWindow3.goml",
-			"testWindow.goml",
 			"testCheckbox.goml",
 			"testLabel.goml",
 			"testAll.goml",
diff --git a/src/GraphicObjects/Border.cs b/src/GraphicObjects/Border.cs
index c8e4a7bb..7011690e 100644
--- a/src/GraphicObjects/Border.cs
+++ b/src/GraphicObjects/Border.cs
@@ -63,8 +63,14 @@ namespace Crow
 				gr.Stroke ();
 			}
 
+			gr.Save ();
+			//clip to client zone
+			CairoHelpers.CairoRectangle (gr, ClientRectangle, CornerRadius);
+			gr.Clip ();
+
 			if (child != null)
 				child.Paint (ref gr);
+			gr.Restore ();
 		}		
 		#endregion
 	}
diff --git a/src/GraphicObjects/Group.cs b/src/GraphicObjects/Group.cs
index a2bc4634..e1e95579 100644
--- a/src/GraphicObjects/Group.cs
+++ b/src/GraphicObjects/Group.cs
@@ -209,9 +209,15 @@ namespace Crow
 		{
 			base.onDraw (gr);
 
+			gr.Save ();
+			//clip to client zone
+			CairoHelpers.CairoRectangle (gr, ClientRectangle, CornerRadius);
+			gr.Clip ();
+
 			foreach (GraphicObject g in children) {
 				g.Paint (ref gr);
 			}
+			gr.Restore ();
 		}
 		protected override void UpdateCache (Context ctx)
 		{
@@ -224,10 +230,15 @@ namespace Crow
 					Clipping.clearAndClip (gr);
 					base.onDraw (gr);
 
+					//clip to client zone
+					CairoHelpers.CairoRectangle (gr, ClientRectangle, CornerRadius);
+					gr.Clip ();
+
 					foreach (GraphicObject c in children) {
 						if (!c.Visible)
 							continue;
-						c.Paint (ref gr);						
+						if (Clipping.intersect(c.Slot + ClientRectangle.Position))
+							c.Paint (ref gr);
 					}
 
 					#if DEBUG_CLIP_RECTANGLE
diff --git a/src/GraphicObjects/PrivateContainer.cs b/src/GraphicObjects/PrivateContainer.cs
index d3a70649..546d0958 100644
--- a/src/GraphicObjects/PrivateContainer.cs
+++ b/src/GraphicObjects/PrivateContainer.cs
@@ -136,8 +136,15 @@ namespace Crow
 		protected override void onDraw (Context gr)
 		{
 			base.onDraw (gr);
+
+			gr.Save ();
+			//clip to client zone
+			CairoHelpers.CairoRectangle (gr, ClientRectangle, CornerRadius);
+			gr.Clip ();
+
 			if (child != null)
 				child.Paint (ref gr);
+			gr.Restore ();
 		}
 		protected override void UpdateCache (Context ctx)
 		{
@@ -157,6 +164,10 @@ namespace Crow
 						
 						base.onDraw (gr);
 
+						//clip to client zone
+						CairoHelpers.CairoRectangle (gr, ClientRectangle, CornerRadius);
+						gr.Clip ();
+
 						child.Paint (ref gr);
 					}
 				}