From 8776ccb3ca259053c2b93b0a068b76a9bf8032f3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jean-Philippe=20Bruy=C3=A8re?= <jp_bruyere@hotmail.com>
Date: Sun, 13 Aug 2017 16:45:33 +0200
Subject: [PATCH] dont back cache in byte array

---
 CrowIDE/ui/MemberView.crow             |  8 ++---
 CrowIDE/ui/MembersView.template        |  4 ++-
 src/GraphicObjects/GraphicObject.cs    | 38 +++++++++-----------
 src/GraphicObjects/Group.cs            | 50 +++++++++++++-------------
 src/GraphicObjects/PrivateContainer.cs | 21 +++++------
 5 files changed, 57 insertions(+), 64 deletions(-)

diff --git a/CrowIDE/ui/MemberView.crow b/CrowIDE/ui/MemberView.crow
index 7d04a3a5..8c4c21ec 100644
--- a/CrowIDE/ui/MemberView.crow
+++ b/CrowIDE/ui/MemberView.crow
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <Window Caption="Properties" Width="30%" Height="60%" AlwaysOnTop="true">
-	<MembersView Instance="{SelectedItem}" DataTest="Type">
+	<MembersView Instance="{SelectedItem}" DataTest="Type"  Background="DimGray">
 	<!--				<Template>
 			<Scroller  Name="scroller1" Margin="1" VerticalScrolling="true"
 				ValueChanged="./_scroller_ValueChanged">
@@ -21,7 +21,7 @@
 					MouseEnter="{Background=UnitedNationsBlue}"
 					MouseLeave="{Background=Transparent}" >
 				<Label Margin="1" Text="{Name}" Height="Fit" Width="50%"/>
-				<CheckBox Background="White" Margin="1" Caption="" IsChecked="{²Value}"/>
+				<CheckBox Background="White" Height="Stretched" Caption="" IsChecked="{²Value}"/>
 			</HorizontalStack>
 		</ItemTemplate>
 		<ItemTemplate DataType="System.Enum">
@@ -29,7 +29,7 @@
 					MouseEnter="{Background=UnitedNationsBlue}"
 					MouseLeave="{Background=Transparent}" >
 				<Label Margin="1" Text="{Name}" Height="Fit" Width="50%"/>
-				<ComboBox Margin="1"  Height="Fit" Width="50%" Data="{Choices}"
+				<ComboBox Margin="0"  Height="Stretched" Width="50%" Data="{Choices}"
 						SelectedIndex="{²Value}">
 					<Template>
 						<Popper Name="popper" PopDirection="Bottom">
@@ -76,7 +76,7 @@
 					MouseEnter="{Background=UnitedNationsBlue}"
 					MouseLeave="{Background=Transparent}" >
 				<Label Margin="1" Text="{Name}" Height="Fit" Width="50%"/>
-				<Popper Background="White" Margin="1" Caption="{Value}">
+				<Popper Background="White" Margin="0" Height="Stretched" Caption="{Value}">
 					<Template>
 						<HorizontalStack Spacing="3" Height="Fit" Background="{./Background}">
 							<Border Foreground="Black" Width="16" Height="10" CornerRadius="3"
diff --git a/CrowIDE/ui/MembersView.template b/CrowIDE/ui/MembersView.template
index 91b7515d..52a9dfe9 100755
--- a/CrowIDE/ui/MembersView.template
+++ b/CrowIDE/ui/MembersView.template
@@ -1,7 +1,9 @@
 <?xml version="1.0"?>
 <Border BorderWidth="5" Margin="1" MinimumSize="10,10">
 	<VerticalStack>
-		<Label Text="{./Instance}"/>
+		<Border Height="Fit">
+			<Label TextAlignment="Left" Text="{./Instance}" Width="Stretched"/>
+		</Border>
 		<Scroller  Name="scroller1" Margin="1" VerticalScrolling="true"		
 			ValueChanged="./_scroller_ValueChanged">
 			<VerticalStack LayoutChanged="./_list_LayoutChanged" Spacing="0"
diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs
index 0db8fb54..284e4877 100644
--- a/src/GraphicObjects/GraphicObject.cs
+++ b/src/GraphicObjects/GraphicObject.cs
@@ -137,7 +137,7 @@ namespace Crow
 		/// <summary>Prevent requeuing multiple times the same widget</summary>
 		public bool IsQueueForRedraw = false;
 		/// <summary>drawing Cache, if null, a redraw is done, cached or not</summary>
-		public byte[] bmp;
+		public Surface bmp;
 		public bool IsDirty = true;
 		/// <summary>
 		/// This size is computed on each child' layout changes.
@@ -1116,33 +1116,27 @@ namespace Crow
 		/// this trigger the effective drawing routine </summary>
 		protected virtual void RecreateCache ()
 		{
-			int stride = 4 * Slot.Width;
-
-			int bmpSize = Math.Abs (stride) * Slot.Height;
-			bmp = new byte[bmpSize];
 			IsDirty = false;
-			using (ImageSurface draw =
-                new ImageSurface(bmp, Format.Argb32, Slot.Width, Slot.Height, stride)) {
-				using (Context gr = new Context (draw)) {
-					gr.Antialias = Interface.Antialias;
-					onDraw (gr);
-				}
-				draw.Flush ();
+			if (bmp != null)
+				bmp.Dispose ();
+			bmp = new ImageSurface (Format.Argb32, Slot.Width, Slot.Height);
+			using (Context gr = new Context (bmp)) {
+				gr.Antialias = Interface.Antialias;
+				onDraw (gr);
 			}
+			bmp.Flush ();
 		}
 		protected virtual void UpdateCache(Context ctx){
 			Rectangle rb = Slot + Parent.ClientRectangle.Position;
-			using (ImageSurface cache = new ImageSurface (bmp, Format.Argb32, Slot.Width, Slot.Height, 4 * Slot.Width)) {
-				if (clearBackground) {
-						ctx.Save ();
-						ctx.Operator = Operator.Clear;
-						ctx.Rectangle (rb);
-						ctx.Fill ();
-						ctx.Restore ();
-				}
-				ctx.SetSourceSurface (cache, rb.X, rb.Y);
-				ctx.Paint ();
+			if (clearBackground) {
+					ctx.Save ();
+					ctx.Operator = Operator.Clear;
+					ctx.Rectangle (rb);
+					ctx.Fill ();
+					ctx.Restore ();
 			}
+			ctx.SetSourceSurface (bmp, rb.X, rb.Y);
+			ctx.Paint ();
 			//Clipping.clearAndClip (ctx);
 			Clipping.Reset();
 		}
diff --git a/src/GraphicObjects/Group.cs b/src/GraphicObjects/Group.cs
index 549ca219..de6d3e40 100644
--- a/src/GraphicObjects/Group.cs
+++ b/src/GraphicObjects/Group.cs
@@ -235,35 +235,35 @@ namespace Crow
 		{
 			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);
-
-				if (Clipping.count > 0) {
-					Clipping.clearAndClip (gr);
-					base.onDraw (gr);
-
-					//clip to client zone
-					CairoHelpers.CairoRectangle (gr, ClientRectangle, CornerRadius);
-					gr.Clip ();
-
-					lock (Children) {
-						foreach (GraphicObject c in Children) {
-							if (!c.Visible)
-								continue;
-							if (Clipping.intersect (c.Slot + ClientRectangle.Position))
-								c.Paint (ref gr);
-						}
-					}
 
-					#if DEBUG_CLIP_RECTANGLE
-					Clipping.stroke (gr, Color.Amaranth.AdjustAlpha (0.8));
-					#endif
+			Context gr = new Context (bmp);
+
+			if (Clipping.count > 0) {
+				Clipping.clearAndClip (gr);
+				base.onDraw (gr);
+
+				//clip to client zone
+				CairoHelpers.CairoRectangle (gr, ClientRectangle, CornerRadius);
+				gr.Clip ();
+
+				lock (Children) {
+					foreach (GraphicObject c in Children) {
+						if (!c.Visible)
+							continue;
+						if (Clipping.intersect (c.Slot + ClientRectangle.Position))
+							c.Paint (ref gr);
+					}
 				}
-				gr.Dispose ();
 
-				ctx.SetSourceSurface (cache, rb.X, rb.Y);
-				ctx.Paint ();
+				#if DEBUG_CLIP_RECTANGLE
+				Clipping.stroke (gr, Color.Amaranth.AdjustAlpha (0.8));
+				#endif
 			}
+			gr.Dispose ();
+
+			ctx.SetSourceSurface (bmp, rb.X, rb.Y);
+			ctx.Paint ();
+
 			Clipping.Reset();
 		}
 		#endregion
diff --git a/src/GraphicObjects/PrivateContainer.cs b/src/GraphicObjects/PrivateContainer.cs
index 4076b5ec..d018bd77 100644
--- a/src/GraphicObjects/PrivateContainer.cs
+++ b/src/GraphicObjects/PrivateContainer.cs
@@ -179,21 +179,18 @@ namespace Crow
 		{
 			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);
+			Context gr = new Context (bmp);
 
-				if (Clipping.count > 0) {
-					Clipping.clearAndClip (gr);
+			if (Clipping.count > 0) {
+				Clipping.clearAndClip (gr);
 
-					onDraw (gr);
-				}
-					
-				gr.Dispose ();
-
-				ctx.SetSourceSurface (cache, rb.X, rb.Y);
-				ctx.Paint ();
+				onDraw (gr);
 			}
-			Clipping.Reset();
+				
+			gr.Dispose ();
+
+			ctx.SetSourceSurface (bmp, rb.X, rb.Y);
+			ctx.Paint ();
 		}
 		#endregion
 
-- 
2.47.3