Merge branch 'NewClipping'

8 files changed, 164 insertions, 2 deletions

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 fbf76ea2..b87bfe75 100644
--- a/Tests/GOLIBTests.cs
+++ b/Tests/GOLIBTests.cs
@@ -37,6 +37,12 @@ namespace test
 		int frameCpt = 0;
 		int idx = 0;
 		string[] testFiles = {
+			"testWindow.goml",
+			"clip4.crow",
+			"clip3.crow",
+			"clip2.crow",
+			"clip0.crow",
+			"clip1.crow",
 			"0.crow",
 			"5.crow",
 			"testCombobox.goml",
@@ -64,7 +70,6 @@ namespace test
 			"testWindow2.goml",
 
 			"testWindow3.goml",
-			"testWindow.goml",
 			"testCheckbox.goml",
 			"testLabel.goml",
 			"testAll.goml",
diff --git a/Tests/Interfaces/clip0.crow b/Tests/Interfaces/clip0.crow
new file mode 100755
index 00000000..2ebea9ff
--- /dev/null
+++ b/Tests/Interfaces/clip0.crow
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<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="false"
+		MouseEnter="{Background=DimGray}" Width="100"
+		MouseLeave="{Background=BlueCrayola}"
+	 	Margin="10" Text="{drawing}" Background="BlueCrayola"/>
+ </Container>
\ No newline at end of file
diff --git a/Tests/Interfaces/clip1.crow b/Tests/Interfaces/clip1.crow
new file mode 100755
index 00000000..4aeb7fde
--- /dev/null
+++ b/Tests/Interfaces/clip1.crow
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<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="true"
+			HorizontalAlignment="Right" VerticalAlignment="Bottom"
+			MouseEnter="{Background=White}"
+			MouseLeave="{Background=Red}">
+			<Container Fit="true" Margin="20" Background="Yellow" CacheEnabled="false"
+				HorizontalAlignment="Right" VerticalAlignment="Bottom"
+				MouseEnter="{Background=Blue}"
+				MouseLeave="{Background=Yellow}">
+				<Container 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}"
+						MouseLeave="{Background=BlueCrayola}" 
+					 	Margin="1" Text="{drawing}" Background="BlueCrayola"/>
+				</Container>
+			</Container>
+		</Container>
+ </Container>
\ No newline at end of file
diff --git a/Tests/Interfaces/clip2.crow b/Tests/Interfaces/clip2.crow
new file mode 100755
index 00000000..4f95bf90
--- /dev/null
+++ b/Tests/Interfaces/clip2.crow
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<Group Fit="true" Margin="50" Background="Yellow" CacheEnabled="true"
+		HorizontalAlignment="Right" VerticalAlignment="Bottom"
+		MouseEnter="{Background=DimGray}"
+		MouseLeave="{Background=Yellow}">
+<Group Width="300" Height="200" Margin="50" Background="LimeGreen" CacheEnabled="false"
+		HorizontalAlignment="Right" VerticalAlignment="Bottom"
+		MouseEnter="{Background=Gray}"
+		MouseLeave="{Background=LimeGreen}">
+	<Label Left="10" HorizontalAlignment="Right" VerticalAlignment="Center" CacheEnabled="true"
+		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/Tests/Interfaces/clip3.crow b/Tests/Interfaces/clip3.crow
new file mode 100755
index 00000000..b08216c0
--- /dev/null
+++ b/Tests/Interfaces/clip3.crow
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<Group Fit="true" Margin="50" Background="Yellow" CacheEnabled="true"
+		HorizontalAlignment="Right" VerticalAlignment="Bottom"
+		MouseEnter="{Background=DimGray}"
+		MouseLeave="{Background=Yellow}">
+	<HorizontalStack Fit="true">
+		<VerticalStack 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"
+				MouseEnter="{Background=DimGray}" Width="100"
+				MouseLeave="{Background=BlueCrayola}"
+			 	Margin="10" Text="{fps}" Background="BlueCrayola"/>
+			<Label HorizontalAlignment="Center" VerticalAlignment="Center" CacheEnabled="true"
+				MouseEnter="{Background=DimGray}" Width="100"
+				MouseLeave="{Background=BlueCrayola}"
+			 	Margin="10" Text="{drawing}" Background="BlueCrayola"/>
+		 </VerticalStack>
+		<VerticalStack 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"
+				MouseEnter="{Background=DimGray}" Width="100"
+				MouseLeave="{Background=BlueCrayola}"
+			 	Margin="10" Text="{fpsMax}" Background="BlueCrayola"/>
+			<Label HorizontalAlignment="Center" VerticalAlignment="Center" CacheEnabled="true"
+				MouseEnter="{Background=DimGray}" Width="100"
+				MouseLeave="{Background=BlueCrayola}"
+			 	Margin="10" Text="{fpsMin}" Background="BlueCrayola"/>
+		 </VerticalStack>
+	</HorizontalStack>
+ </Group>
\ No newline at end of file
diff --git a/Tests/Interfaces/clip4.crow b/Tests/Interfaces/clip4.crow
new file mode 100755
index 00000000..69fc7f12
--- /dev/null
+++ b/Tests/Interfaces/clip4.crow
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<Border Fit="true" BorderWidth="2"  >
+<Scroller CornerRadius="2" VerticalScrolling="true" Height="200" Width="300" Background="DimGray" Margin="2">
+	<VerticalStack Margin="10" VerticalAlignment="Top" Fit="true" Background="vgradient|0:BlueCrayola|1:Black" >
+		 <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 1"/>
+		 <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 2"/>
+		 <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 3"/>
+		 <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 4"/>
+		 <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 5"/>
+		 <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 6"/>
+		 <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 7"/>
+		 <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 8"/>
+		 <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 9"/>
+		 <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 10"/>
+		 <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 11"/>
+		 <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 12"/>
+		 <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 13"/>
+		 <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 14"/>
+		 <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 15"/>
+		 <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 16"/>
+		 <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 17"/>
+		 <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 18"/>
+		 <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 19"/>
+		 <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 20"/>
+		 <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 21"/>
+		 <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 22"/>
+		 <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 23"/>
+		 <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 24"/>
+		 <Label MouseEnter="{Background=Gray}" MouseLeave="{Background=hgradient|0:DarkRed|1:Transparent}" Margin="5" Background="hgradient|0:DarkRed|1:Transparent" Font="droid,20" Text="label 25"/>
+	</VerticalStack>
+</Scroller>
+</Border>
+<!--<VerticalStack Fit="true" Margin="50" Background="LimeGreen" CacheEnabled="false"
+		HorizontalAlignment="Right" VerticalAlignment="Bottom"
+		MouseEnter="{Background=Gray}"
+		MouseLeave="{Background=LimeGreen}">
+
+		<CheckBox Margin="20" Background="BlueCrayola"/>
+		<CheckBox/>
+		<CheckBox/>
+		<CheckBox/>
+		<CheckBox/>
+		<RadioButton/>
+		<RadioButton/>
+		<RadioButton/>
+		<RadioButton/>
+		<RadioButton/>
+		<CheckBox/>
+
+	<Label HorizontalAlignment="Center" VerticalAlignment="Center" CacheEnabled="true"
+		MouseEnter="{Background=DimGray}" Width="100"
+		MouseLeave="{Background=BlueCrayola}"
+	 	Margin="10" Text="{fps}" Background="BlueCrayola"/>
+	<Label HorizontalAlignment="Center" VerticalAlignment="Center" CacheEnabled="true"
+		MouseEnter="{Background=DimGray}" Width="100"
+		MouseLeave="{Background=BlueCrayola}"
+	 	Margin="10" Text="{drawing}" Background="BlueCrayola"/>
+ </VerticalStack>-->
\ No newline at end of file
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index cbb628a7..091b535c 100644
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -224,6 +224,21 @@
     <None Include="Interfaces\testStacks.crow">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="Interfaces\clip0.crow">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Interfaces\clip1.crow">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Interfaces\clip2.crow">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Interfaces\clip3.crow">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="Interfaces\clip4.crow">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Interfaces\" />