From: jpbruyere <jp.bruyere@hotmail.com>
Date: Fri, 5 Feb 2016 13:40:36 +0000 (+0100)
Subject: Revert "Merge branch 'GroupCacheEnableDisable'"
X-Git-Tag: 0.3~51
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=829c71bc6ae4d92553627e1c0d21fc0147606e0e;p=jp%2Fcrow.git

Revert "Merge branch 'GroupCacheEnableDisable'"

This reverts commit 016421c29b8daf86c273f919a4e3e13faefc5639, reversing
changes made to acfb21c78055c8294b885baba4756cb147c4c351.
---

diff --git a/Crow.userprefs b/Crow.userprefs
index 1119c399..a89a8f1f 100644
--- a/Crow.userprefs
+++ b/Crow.userprefs
@@ -1,11 +1,17 @@
 <Properties GitUserInfo="UsingGIT" StartupItem="Tests/Tests.csproj">
   <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|Linux_x86" />
-  <MonoDevelop.Ide.Workbench ActiveDocument="src/GraphicObjects/Group.cs">
+  <MonoDevelop.Ide.Workbench ActiveDocument="Tests/GOLIBTests.cs">
     <Files>
-      <File FileName="Tests/Interfaces/4.crow" Line="371" Column="19" />
-      <File FileName="Tests/GOLIBTests.cs" Line="40" Column="6" />
-      <File FileName="src/GraphicObjects/Group.cs" Line="247" Column="31" />
-      <File FileName="src/GraphicObjects/GraphicObject.cs" Line="462" Column="22" />
+      <File FileName="Tests/GOLIBTests.cs" Line="98" Column="2" />
+      <File FileName="src/GraphicObjects/GraphicObject.cs" Line="538" Column="3" />
+      <File FileName="src/GraphicObjects/Group.cs" Line="197" Column="1" />
+      <File FileName="src/GraphicObjects/PrivateContainer.cs" Line="127" Column="1" />
+      <File FileName="src/OpenTKGameWindow.cs" Line="328" Column="10" />
+      <File FileName="src/Rectangles.cs" Line="90" Column="21" />
+      <File FileName="src/GraphicObjects/Scroller.cs" Line="196" Column="1" />
+      <File FileName="src/LayoutingQueue.cs" Line="30" Column="4" />
+      <File FileName="src/Interface.cs" Line="56" Column="1" />
+      <File FileName="UnitTest/NUnitCrowWindow.cs" Line="163" Column="1" />
     </Files>
   </MonoDevelop.Ide.Workbench>
   <MonoDevelop.Ide.DebuggingService.Breakpoints>
diff --git a/Tests/Interfaces/4.crow b/Tests/Interfaces/4.crow
index ba7cb110..833e2bce 100755
--- a/Tests/Interfaces/4.crow
+++ b/Tests/Interfaces/4.crow
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <HorizontalStack Fit="true">
-	<VerticalStack Fit="true" Spacing="10" Caching="false">
+	<VerticalStack Fit="true" Name="vsFps"  Spacing="10" >
 		<HorizontalStack Fit="true">
 			<Label Text="Update:" Width="50" TextAlignment="RightCenter"/>
 			<Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
@@ -92,7 +92,7 @@
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 	</VerticalStack>
-	<VerticalStack Fit="true" Spacing="10" Caching="false">
+	<VerticalStack Fit="true" Name="vsFps"  Spacing="10" >
 		<HorizontalStack Fit="true">
 			<Label Text="Update:" Width="50" TextAlignment="RightCenter"/>
 			<Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
@@ -184,7 +184,7 @@
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 	</VerticalStack>
-	<VerticalStack Fit="true" Spacing="10" Caching="false">
+	<VerticalStack Fit="true" Name="vsFps"  Spacing="10" >
 		<HorizontalStack Fit="true">
 			<Label Text="Update:" Width="50" TextAlignment="RightCenter"/>
 			<Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
@@ -276,7 +276,7 @@
 				Background="vgradient|0:AoEnglish|1:Black"/>
 		</HorizontalStack>
 	</VerticalStack>
-	<VerticalStack Fit="true" Spacing="10" Caching="false">
+	<VerticalStack Fit="true" Name="vsFps"  Spacing="10" >
 		<HorizontalStack Fit="true">
 			<Label Text="Update:" Width="50" TextAlignment="RightCenter"/>
 			<Label Name="labUpdate" Text="{update}" Font="droid,12" Width="80" TextAlignment="Center"
diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs
index c0f9bab0..e181fdf7 100644
--- a/src/GraphicObjects/GraphicObject.cs
+++ b/src/GraphicObjects/GraphicObject.cs
@@ -79,7 +79,6 @@ namespace Crow
 		HorizontalAlignment _horizontalAlignment = HorizontalAlignment.Center;
 		Size _maximumSize = "0;0";
 		Size _minimumSize = "0;0";
-		bool isRegisteredForRepaint = false;
 		#endregion
 
 		#region public fields
@@ -460,16 +459,11 @@ namespace Crow
 			//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 || !p.Caching) {
-					p.RegisterForRedraw ();	
+				if (p.bmp == null)
 					return;
-				}
 			}
-			if (HostContainer == null || isRegisteredForRepaint)
-				return;
-
-			HostContainer.gobjsToRedraw.Add (this);
-			isRegisteredForRepaint = true;
+			if (HostContainer != null)
+				HostContainer.gobjsToRedraw.Add (this);
 		}
 
 		/// <summary>
@@ -491,7 +485,6 @@ namespace Crow
 			//this clipping should take only last painted slots in ancestor tree which
 			//is not the case for now.
 			HostContainer.redrawClip.AddRectangle (ScreenCoordinates(LastPaintedSlot));
-			isRegisteredForRepaint = false;
 		}
 		/// <summary> return size of content + margins </summary>
 		protected virtual Size measureRawSize ()
diff --git a/src/GraphicObjects/Group.cs b/src/GraphicObjects/Group.cs
index 931ad334..14142e0d 100644
--- a/src/GraphicObjects/Group.cs
+++ b/src/GraphicObjects/Group.cs
@@ -27,14 +27,10 @@ namespace Crow
 		internal int maxChildrenHeight = 0;
 
         bool _multiSelect = false;
-		bool _caching = false;
 		List<GraphicObject> children = new List<GraphicObject>();
 
         public GraphicObject activeWidget;
 
-
-
-
         public virtual List<GraphicObject> Children {
 			get { return children; }
 			set { children = value; }
@@ -43,23 +39,9 @@ namespace Crow
         public bool MultiSelect
         {
             get { return _multiSelect; }
-            set { 
-				if (value == _multiSelect)
-					return;
-				_multiSelect = value; 
-				NotifyValueChanged ("MultiSelect", _multiSelect);
-			}
+            set { _multiSelect = value; }
         }
-		[XmlAttributeAttribute()][DefaultValue(true)]
-		public bool Caching {
-			get { return _caching; }
-			set {
-				if (value == _caching)
-					return;
-				_caching = value; 
-				NotifyValueChanged ("Caching", _multiSelect);
-			}
-		}			
+			
 			
         public virtual T addChild<T>(T child)
         {