From e56fb3c567aad956a19bd9f2757c35c26601740f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jean-Philippe=20Bruy=C3=A8re?= <jp_bruyere@hotmail.com>
Date: Thu, 22 Mar 2018 00:47:55 +0100
Subject: [PATCH] get iface through parenting to prevent queuing out of tree
 widgets

---
 CrowIDE/src/Editors/ImlVisualEditor.cs      |   4 +-
 CrowIDE/src/GraphicObjectDesignContainer.cs |   4 +-
 CrowIDE/ui/editors/IMLEdit.itemp            |   4 -
 Tests/BasicTests.cs                         |   4 +-
 Tests/Interfaces/Divers/welcome.crow        |   4 +-
 src/BmpPicture.cs                           |  15 +--
 src/GraphicObjects/GraphicObject.cs         | 105 ++++++++++----------
 src/GraphicObjects/ILayoutable.cs           |   2 +
 src/GraphicObjects/IMLContainer.cs          |  32 +++++-
 src/GraphicObjects/Image.cs                 |  57 +++++------
 src/GraphicObjects/MessageBox.cs            |   4 +-
 src/GraphicObjects/Popper.cs                |   4 +-
 src/GraphicObjects/ProgressBar.cs           |   5 +-
 src/GraphicObjects/Slider.cs                |   6 +-
 src/GraphicObjects/TabItem.cs               |   6 +-
 src/GraphicObjects/TemplatedContainer.cs    |   4 +-
 src/GraphicObjects/TemplatedControl.cs      |  26 ++---
 src/GraphicObjects/TemplatedGroup.cs        |   4 +-
 src/GraphicObjects/Window.cs                |   6 +-
 src/IML/IMLContext.cs                       |   2 +-
 src/Instantiator.cs                         |  11 +-
 src/Interface.cs                            |   7 +-
 src/Picture.cs                              |   2 +-
 src/SvgPicture.cs                           |  30 +++---
 24 files changed, 195 insertions(+), 153 deletions(-)

diff --git a/CrowIDE/src/Editors/ImlVisualEditor.cs b/CrowIDE/src/Editors/ImlVisualEditor.cs
index 11f94c17..3c5ecc67 100644
--- a/CrowIDE/src/Editors/ImlVisualEditor.cs
+++ b/CrowIDE/src/Editors/ImlVisualEditor.cs
@@ -72,8 +72,8 @@ namespace Crow.Coding
 		}
 
 		void initIcons () {
-			icoMove = new SvgPicture ();
-			icoMove.Load (IFace, "#Crow.Coding.icons.move-arrows.svg");
+			icoMove = new SvgPicture ("#Crow.Coding.icons.move-arrows.svg");
+			icoMove.Load (IFace);
 //			icoStyle = new SvgPicture ();
 //			icoStyle.Load (IFace, "#Crow.Coding.icons.palette.svg");
 		}
diff --git a/CrowIDE/src/GraphicObjectDesignContainer.cs b/CrowIDE/src/GraphicObjectDesignContainer.cs
index 4540898b..e2e1ac8d 100644
--- a/CrowIDE/src/GraphicObjectDesignContainer.cs
+++ b/CrowIDE/src/GraphicObjectDesignContainer.cs
@@ -53,8 +53,8 @@ namespace Crow.Coding
 			lock (go.IFace.UpdateMutex) {				
 				go.IFace.DragImageHeight = dragIconSize;
 				go.IFace.DragImageWidth = dragIconSize;
-				SvgPicture pic = new SvgPicture ();
-				pic.Load (go.IFace, IconPath);
+				SvgPicture pic = new SvgPicture (IconPath);
+				pic.Load (go.IFace);
 				ImageSurface img = new ImageSurface (Format.Argb32, dragIconSize, dragIconSize);
 				using (Context ctx = new Context (img)) {
 					Rectangle r = new Rectangle (0, 0, dragIconSize, dragIconSize);
diff --git a/CrowIDE/ui/editors/IMLEdit.itemp b/CrowIDE/ui/editors/IMLEdit.itemp
index 84f391cf..6ea1391f 100644
--- a/CrowIDE/ui/editors/IMLEdit.itemp
+++ b/CrowIDE/ui/editors/IMLEdit.itemp
@@ -44,9 +44,5 @@
 		</VerticalStack>
 		<Splitter/>
 		<IMLContainer Path="#Crow.Coding.ui.SourceEditor.crow"/>
-<!--		<Label DataSource="{../editor.Error}" Text="{}"
-			Visible="{../editor.HasError}"
-			Height="Fit" Width="Stretched" Background="DarkRed" Foreground="White"
-			TextAlignment="TopLeft" Multiline="true"/>-->
 	</VerticalStack>
 </TabItem>
diff --git a/Tests/BasicTests.cs b/Tests/BasicTests.cs
index af624ee5..6883360d 100644
--- a/Tests/BasicTests.cs
+++ b/Tests/BasicTests.cs
@@ -194,8 +194,10 @@ namespace Tests
 			this.KeyDown += KeyboardKeyDown1;
 
 			//testFiles = new string [] { @"Interfaces/Experimental/testDock.crow" };
-			testFiles = new string [] { @"Interfaces/Divers/welcome.crow" };
+			//testFiles = new string [] { @"Interfaces/Divers/welcome.crow" };
 			//testFiles = new string [] { @"Interfaces/Divers/0.crow" };
+			//testFiles = new string [] { @"Interfaces/Divers/testIMLContainer.crow" };
+			testFiles = new string [] { @"Interfaces/TemplatedContainer/testTabView.crow" };
 			//testFiles = new string [] { @"Interfaces/TemplatedContainer/testTreeView.crow" };
 			//testFiles = new string [] { @"Interfaces/Divers/colorPicker.crow" };
 //			testFiles = new string[] { @"Interfaces/TemplatedControl/testItemTemplateTag.crow" };
diff --git a/Tests/Interfaces/Divers/welcome.crow b/Tests/Interfaces/Divers/welcome.crow
index b65a4553..8db6dc65 100644
--- a/Tests/Interfaces/Divers/welcome.crow
+++ b/Tests/Interfaces/Divers/welcome.crow
@@ -4,4 +4,6 @@
 	<Slider Orientation="Vertical" Height="Stretched" Width="20" Background="DimGray"/>
 	<Label Name="ShowTarget" Background="DarkBlue"/>
 </VerticalStack>-->
-<Slider Orientation="Horizontal" Height="10" Width="100" Background="DimGray"/>
\ No newline at end of file
+<Popper >
+	<Label/>
+</Popper>
\ No newline at end of file
diff --git a/src/BmpPicture.cs b/src/BmpPicture.cs
index 42ab2a08..d132ba89 100644
--- a/src/BmpPicture.cs
+++ b/src/BmpPicture.cs
@@ -55,18 +55,21 @@ namespace Crow
 		/// load the image for rendering from the path given as argument
 		/// </summary>
 		/// <param name="path">image path, may be embedded</param>
-		public override void Load (Interface iface, string path)
+		public override void Load (Interface iface)
 		{
-			Path = path;
-			if (sharedResources.ContainsKey (path)) {
-				sharedPicture sp = sharedResources [path];
+			Loaded = false;
+			if (iface == null)
+				return;
+			
+			if (sharedResources.ContainsKey (Path)) {
+				sharedPicture sp = sharedResources [Path];
 				image = (byte[])sp.Data;
 				Dimensions = sp.Dims;
 			} else {
-				using (Stream stream = iface.GetStreamFromPath (path)) {				
+				using (Stream stream = iface.GetStreamFromPath (Path)) {				
 					loadBitmap (new System.Drawing.Bitmap (stream));	
 				}
-				sharedResources [path] = new sharedPicture (image, Dimensions);
+				sharedResources [Path] = new sharedPicture (image, Dimensions);
 			}
 			Loaded = true;
 		}
diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs
index d1ae13c9..60f1bf06 100644
--- a/src/GraphicObjects/GraphicObject.cs
+++ b/src/GraphicObjects/GraphicObject.cs
@@ -171,24 +171,24 @@ namespace Crow
 				throw new Exception("Trying to dispose an object queued for Redraw: " + this.ToString());
 				#endif
 
-				if (IFace.HoverWidget != null) {
-					if (IFace.HoverWidget.IsOrIsInside(this))
-						IFace.HoverWidget = null;
-				}
-				if (IFace.ActiveWidget != null) {
-					if (IFace.ActiveWidget.IsOrIsInside (this))
-						IFace.ActiveWidget = null;
-				}
-				if (IFace.FocusedWidget != null) {
-					if (IFace.FocusedWidget.IsOrIsInside (this))
-						IFace.FocusedWidget = null;
-				}
-				if (!localDataSourceIsNull)
-					DataSource = null;
-
-				parentRWLock.EnterWriteLock();
-				parent = null;
-				parentRWLock.ExitWriteLock();
+//				if (IFace.HoverWidget != null) {
+//					if (IFace.HoverWidget.IsOrIsInside(this))
+//						IFace.HoverWidget = null;
+//				}
+//				if (IFace.ActiveWidget != null) {
+//					if (IFace.ActiveWidget.IsOrIsInside (this))
+//						IFace.ActiveWidget = null;
+//				}
+//				if (IFace.FocusedWidget != null) {
+//					if (IFace.FocusedWidget.IsOrIsInside (this))
+//						IFace.FocusedWidget = null;
+//				}
+//				if (!localDataSourceIsNull)
+//					DataSource = null;
+
+				//parentRWLock.EnterWriteLock();
+				Parent = null;
+				//parentRWLock.ExitWriteLock();
 			} else
 				Debug.WriteLine ("!!! Finalized by GC: {0}", this.ToString ());
 			Clipping?.Dispose ();
@@ -208,8 +208,7 @@ namespace Crow
 		/// <summary>
 		/// interface this widget is bound to, this should not be changed once the instance is created
 		/// </summary>
-		public Interface IFace = null;
-
+		public Interface IFace { get { return parent?.IFace; }}
 		/// <summary>
 		/// contains the dirty rectangles in the coordinate system of the cache. those dirty zones
 		/// are repeated at each cached levels of the tree with correspondig coordinate system. This is done
@@ -260,16 +259,16 @@ namespace Crow
 		/// <param name="iface">Iface.</param>
 		public GraphicObject (Interface iface) : this()
 		{
-			IFace = iface;
-			Initialize ();
+			//IFace = iface;
+			Initialize (iface);
 		}
 		#endregion
 		//internal bool initialized = false;
 		/// <summary>
 		/// Initialize this Graphic object instance by setting style and default values and loading template if required
 		/// </summary>
-		public virtual void Initialize(){
-			loadDefaultValues ();
+		public virtual void Initialize(Interface iFace){
+			loadDefaultValues (iFace);
 			//initialized = true;
 		}
 		#region private fields
@@ -1030,7 +1029,7 @@ namespace Crow
 
 		#region Default and Style Values loading
 		/// <summary> Loads the default values from XML attributes default </summary>
-		public void loadDefaultValues()
+		public void loadDefaultValues(Interface iFace)
 		{
 //			#if DEBUG_LOAD
 //			Debug.WriteLine ("LoadDefValues for " + this.ToString ());
@@ -1039,17 +1038,17 @@ namespace Crow
 			Type thisType = this.GetType ();
 
 			if (!string.IsNullOrEmpty (Style)) {
-				if (IFace.DefaultValuesLoader.ContainsKey (Style)) {
-					IFace.DefaultValuesLoader [Style] (this);
+				if (iFace.DefaultValuesLoader.ContainsKey (Style)) {
+					iFace.DefaultValuesLoader [Style] (this);
 					onInitialized (this, null);
 					return;
 				}
-			} else if (IFace.DefaultValuesLoader.ContainsKey (thisType.FullName)) {
-				IFace.DefaultValuesLoader [thisType.FullName] (this);
+			} else if (iFace.DefaultValuesLoader.ContainsKey (thisType.FullName)) {
+				iFace.DefaultValuesLoader [thisType.FullName] (this);
 				onInitialized (this, null);
 				return;
-			} else 	if (IFace.DefaultValuesLoader.ContainsKey (thisType.Name)) {
-				IFace.DefaultValuesLoader [thisType.Name] (this);
+			} else 	if (iFace.DefaultValuesLoader.ContainsKey (thisType.Name)) {
+				iFace.DefaultValuesLoader [thisType.Name] (this);
 				onInitialized (this, null);
 				return;
 			}
@@ -1063,17 +1062,17 @@ namespace Crow
 			//   those files being placed in a Styles folder
 			string styleKey = Style;
 			if (!string.IsNullOrEmpty (Style)) {
-				if (IFace.Styling.ContainsKey (Style)) {
-					styling.Add (IFace.Styling [Style]);
+				if (iFace.Styling.ContainsKey (Style)) {
+					styling.Add (iFace.Styling [Style]);
 				}
 			}
-			if (IFace.Styling.ContainsKey (thisType.FullName)) {
-				styling.Add (IFace.Styling [thisType.FullName]);
+			if (iFace.Styling.ContainsKey (thisType.FullName)) {
+				styling.Add (iFace.Styling [thisType.FullName]);
 				if (string.IsNullOrEmpty (styleKey))
 					styleKey = thisType.FullName;
 			}
-			if (IFace.Styling.ContainsKey (thisType.Name)) {
-				styling.Add (IFace.Styling [thisType.Name]);
+			if (iFace.Styling.ContainsKey (thisType.Name)) {
+				styling.Add (iFace.Styling [thisType.Name]);
 				if (string.IsNullOrEmpty (styleKey))
 					styleKey = thisType.Name;
 			}
@@ -1193,8 +1192,8 @@ namespace Crow
 			#endregion
 
 			try {
-				IFace.DefaultValuesLoader[styleKey] = (Interface.LoaderInvoker)dm.CreateDelegate(typeof(Interface.LoaderInvoker));
-				IFace.DefaultValuesLoader[styleKey] (this);
+				iFace.DefaultValuesLoader[styleKey] = (Interface.LoaderInvoker)dm.CreateDelegate(typeof(Interface.LoaderInvoker));
+				iFace.DefaultValuesLoader[styleKey] (this);
 			} catch (Exception ex) {
 				throw new Exception ("Error applying style <" + styleKey + ">:", ex);
 			}
@@ -1385,12 +1384,15 @@ namespace Crow
 			IsDirty = true;
 			EnqueueForRepaint ();
 		}
-		protected void EnqueueForRepaint (){
+		protected virtual void EnqueueForRepaint (){
 			//if no layouting remains in queue for item, registre for redraw
 			if (requestedLayoutings != LayoutingType.None)
 				RegisterForLayouting ();
-			else if (RegisteredLayoutings == LayoutingType.None && IsDirty)
-				IFace.EnqueueForRepaint (this);			
+			else if (RegisteredLayoutings == LayoutingType.None && IsDirty) {
+				Interface iface = IFace;
+				if (iface != null)
+					IFace.EnqueueForRepaint (this);
+			}
 		}
 		#endregion
 
@@ -1405,11 +1407,11 @@ namespace Crow
 		public virtual void ChildrenLayoutingConstraints(ref LayoutingType layoutType){
 		}
 		public virtual bool ArrangeChildren { get { return false; } }
+
 		public virtual void RegisterForLayouting(LayoutingType layoutType = LayoutingType.None){
-			if (Parent == null || !Monitor.TryEnter(IFace.LayoutMutex)) {
+			Interface iface = IFace;
+			if (iface == null || !Monitor.TryEnter(IFace.LayoutMutex)) {
 				requestedLayoutings |= layoutType;
-//				if (registeredLayoutings != LayoutingType.None)
-//					Debugger.Break ();
 				return;
 			}
 			layoutType |= requestedLayoutings;
@@ -1433,9 +1435,6 @@ namespace Crow
 			if (Parent is GraphicObject)
 				(Parent as GraphicObject).ChildrenLayoutingConstraints (ref layoutType);
 
-//				//prevent queueing same LayoutingType for this
-//				layoutType &= (~RegisteredLayoutings);
-
 			if (layoutType == LayoutingType.None) {
 				Monitor.Exit (IFace.LayoutMutex);
 				return;
@@ -1443,15 +1442,15 @@ namespace Crow
 
 			//enqueue LQI LayoutingTypes separately
 			if (layoutType.HasFlag (LayoutingType.Width))
-				IFace.LayoutingQueue.Enqueue (new LayoutingQueueItem (LayoutingType.Width, this));
+				iface.LayoutingQueue.Enqueue (new LayoutingQueueItem (LayoutingType.Width, this));
 			if (layoutType.HasFlag (LayoutingType.Height))
-				IFace.LayoutingQueue.Enqueue (new LayoutingQueueItem (LayoutingType.Height, this));
+				iface.LayoutingQueue.Enqueue (new LayoutingQueueItem (LayoutingType.Height, this));
 			if (layoutType.HasFlag (LayoutingType.X))
-				IFace.LayoutingQueue.Enqueue (new LayoutingQueueItem (LayoutingType.X, this));
+				iface.LayoutingQueue.Enqueue (new LayoutingQueueItem (LayoutingType.X, this));
 			if (layoutType.HasFlag (LayoutingType.Y))
-				IFace.LayoutingQueue.Enqueue (new LayoutingQueueItem (LayoutingType.Y, this));
+				iface.LayoutingQueue.Enqueue (new LayoutingQueueItem (LayoutingType.Y, this));
 			if (layoutType.HasFlag (LayoutingType.ArrangeChildren))
-				IFace.LayoutingQueue.Enqueue (new LayoutingQueueItem (LayoutingType.ArrangeChildren, this));
+				iface.LayoutingQueue.Enqueue (new LayoutingQueueItem (LayoutingType.ArrangeChildren, this));
 			
 			Monitor.Exit (IFace.LayoutMutex);
 		}
diff --git a/src/GraphicObjects/ILayoutable.cs b/src/GraphicObjects/ILayoutable.cs
index c8aa38fb..138e800d 100644
--- a/src/GraphicObjects/ILayoutable.cs
+++ b/src/GraphicObjects/ILayoutable.cs
@@ -37,6 +37,8 @@ namespace Crow
 		///  to the parent in the graphic tree </summary>
 		ILayoutable LogicalParent { get; set; }
 
+		Interface IFace { get; }
+
 		Rectangle ClientRectangle { get; }
 		Rectangle getSlot();
 
diff --git a/src/GraphicObjects/IMLContainer.cs b/src/GraphicObjects/IMLContainer.cs
index 84692284..f6126b95 100644
--- a/src/GraphicObjects/IMLContainer.cs
+++ b/src/GraphicObjects/IMLContainer.cs
@@ -34,6 +34,7 @@ namespace Crow
 		}
 
 		string path;
+		bool loaded = true;
 
 		public string Path {
 			get { return path; }
@@ -41,10 +42,39 @@ namespace Crow
 				if (path == value)
 					return;
 				path = value;
-				this.SetChild (IFace.Load (path));
+
+				if (path == null)
+					this.SetChild (null);
+				else
+					loaded = false;
+				
 				NotifyValueChanged ("Path", path);
 			}
 		}
+		protected override void EnqueueForRepaint ()
+		{
+			if (!loaded) {
+				Interface iface = IFace;
+				if (iface != null) {
+					this.SetChild (iface.Load (path));
+					loaded = true;
+					RegisterForGraphicUpdate ();
+					return;
+				}
+			}
+			base.EnqueueForRepaint ();
+		}
+		protected override void SetChild (GraphicObject _child)
+		{
+			base.SetChild (_child);
+			if (_child != null) {
+				if (_child.localDataSourceIsNull) {
+					object ds = DataSource;
+					if (ds != null)
+						OnDataSourceChanged (this, new DataSourceChangeEventArgs (null, ds));
+				}
+			}
+		}
 	}
 }
 
diff --git a/src/GraphicObjects/Image.cs b/src/GraphicObjects/Image.cs
index faa13ec4..9deb2e38 100644
--- a/src/GraphicObjects/Image.cs
+++ b/src/GraphicObjects/Image.cs
@@ -89,19 +89,18 @@ namespace Crow
 			set {
 				if (value == Path)
 					return;
-				try {
-					if (string.IsNullOrEmpty(value))
-						Picture = null;
-					else {
-						//lock(IFace.LayoutMutex){
-							LoadImage (value);
-						//}
-					}
-				} catch (Exception ex) {
-					Debug.WriteLine (ex.Message);
+				if (string.IsNullOrEmpty (value))
 					_pic = null;
+				else {
+					if (value.EndsWith (".svg", true, System.Globalization.CultureInfo.InvariantCulture))
+						_pic = new SvgPicture (value);
+					else
+						_pic = new BmpPicture (value);
+					_pic.Scaled = scaled;
+					_pic.KeepProportions = keepProps;
 				}
 				NotifyValueChanged ("Path", Path);
+				RegisterForGraphicUpdate ();
 			}
 		}
 		/// <summary>
@@ -131,7 +130,7 @@ namespace Crow
 				_pic = value;
 				if (_pic!=null){
 					if (!_pic.Loaded)
-						_pic.Load (IFace, _pic.Path);
+						_pic.Load (IFace);
 					Scaled = _pic.Scaled;
 					KeepProportions = _pic.KeepProportions;
 				}
@@ -170,29 +169,31 @@ namespace Crow
 		}
 		#endregion
 
-		#region Image Loading
-		public void LoadImage (string path)
-		{
-			Picture pic;
-			if (path.EndsWith (".svg", true, System.Globalization.CultureInfo.InvariantCulture))
-				pic = new SvgPicture (path);
-			else
-				pic = new BmpPicture (path);
-
-			pic.Load (IFace, path);
-			pic.Scaled = scaled;
-			pic.KeepProportions = keepProps;
-
-			Picture = pic;
-		}
-		#endregion
 
 		#region GraphicObject overrides
+		protected override void EnqueueForRepaint ()
+		{
+			if (_pic != null) {
+				if (!_pic.Loaded) {
+					Interface iface = IFace;
+					if (iface != null) {
+						_pic.Load (iface);
+						RegisterForGraphicUpdate ();
+					}
+					return;
+				}
+			}
+			base.EnqueueForRepaint ();
+		}
 		public override int measureRawSize (LayoutingType lt)
 		{
 			if (_pic == null)
 				return 2 * Margin;
 				//_pic = "#Crow.Images.Icons.IconAlerte.svg";
+
+			if (!_pic.Loaded)
+				_pic.Load (IFace);
+			
 			//TODO:take scalling in account
 			if (lt == LayoutingType.Width)
 				return _pic.Dimensions.Width + 2 * Margin;
@@ -204,7 +205,7 @@ namespace Crow
 			base.onDraw (gr);
 
 			if (_pic == null)
-				return;
+				return;			
 
 			_pic.Paint (gr, ClientRectangle, _svgSub);
 
diff --git a/src/GraphicObjects/MessageBox.cs b/src/GraphicObjects/MessageBox.cs
index 45ef1e00..78c4f90f 100644
--- a/src/GraphicObjects/MessageBox.cs
+++ b/src/GraphicObjects/MessageBox.cs
@@ -47,9 +47,9 @@ namespace Crow
 
 		}
 
-		protected override void loadTemplate (GraphicObject template)
+		protected override void loadTemplate(Interface iFace, GraphicObject template = null)
 		{
-			base.loadTemplate (template);
+			base.loadTemplate (iFace, template);
 			NotifyValueChanged ("MsgIcon", "#Crow.Images.Icons.Informations.svg");
 		}
 		string message, okMessage, cancelMessage, noMessage;
diff --git a/src/GraphicObjects/Popper.cs b/src/GraphicObjects/Popper.cs
index 1186e8e7..e39b9090 100644
--- a/src/GraphicObjects/Popper.cs
+++ b/src/GraphicObjects/Popper.cs
@@ -232,9 +232,9 @@ namespace Crow
 		}
 		public virtual void onUnpop(object sender, EventArgs e)
 		{
-			if (Content != null) {
+			if (Content != null)
 				Content.Visible = false;
-			}
+			
 			Unpoped.Raise (this, e);
 		}
 
diff --git a/src/GraphicObjects/ProgressBar.cs b/src/GraphicObjects/ProgressBar.cs
index e8165fd2..dc989b19 100644
--- a/src/GraphicObjects/ProgressBar.cs
+++ b/src/GraphicObjects/ProgressBar.cs
@@ -43,10 +43,7 @@ namespace Crow
 		public ProgressBar(Interface iface) : base(iface){}
 		#endregion
 
-		protected override void loadTemplate (GraphicObject template)
-		{
-			
-		}
+		protected override void loadTemplate(Interface iFace, GraphicObject template = null){}
 
 		#region GraphicObject overrides
 		protected override void onDraw (Context gr)
diff --git a/src/GraphicObjects/Slider.cs b/src/GraphicObjects/Slider.cs
index 2bdd5b8a..43e6e2e6 100644
--- a/src/GraphicObjects/Slider.cs
+++ b/src/GraphicObjects/Slider.cs
@@ -50,11 +50,7 @@ namespace Crow
 
 		#region implemented abstract members of TemplatedControl
 
-		protected override void loadTemplate (GraphicObject template = null)
-		{
-			
-		}
-
+		protected override void loadTemplate(Interface iFace, GraphicObject template = null){}
 		#endregion
 
 		#region private fields
diff --git a/src/GraphicObjects/TabItem.cs b/src/GraphicObjects/TabItem.cs
index 473fc313..aa7954d5 100644
--- a/src/GraphicObjects/TabItem.cs
+++ b/src/GraphicObjects/TabItem.cs
@@ -66,9 +66,9 @@ namespace Crow
 					value.LogicalParent = this;
 			}
 		}
-		protected override void loadTemplate(GraphicObject template = null)
+		protected override void loadTemplate(Interface iFace, GraphicObject template = null)
 		{
-			base.loadTemplate (template);
+			base.loadTemplate (iFace, template);
 
 			titleWidget = this.child.FindByName ("TabTitle");
 		}
@@ -191,7 +191,7 @@ namespace Crow
 			set {
 				base.Parent = value;
 				if (value != null) {
-					dragStartPoint = IFace.Mouse.Position;
+					//dragStartPoint = IFace.Mouse.Position;
 					savedParent = value as TabView;
 				}
 			}
diff --git a/src/GraphicObjects/TemplatedContainer.cs b/src/GraphicObjects/TemplatedContainer.cs
index a779595d..5d18ea50 100644
--- a/src/GraphicObjects/TemplatedContainer.cs
+++ b/src/GraphicObjects/TemplatedContainer.cs
@@ -73,9 +73,9 @@ namespace Crow
 			get { return _contentContainer?.Child != null; }
 		}
 		//TODO: move loadTemplate and ResolveBinding in TemplatedContainer
-		protected override void loadTemplate(GraphicObject template = null)
+		protected override void loadTemplate(Interface iFace, GraphicObject template = null)
 		{
-			base.loadTemplate (template);
+			base.loadTemplate (iFace, template);
 			_contentContainer = this.child.FindByName ("Content") as Container;
 		}
 
diff --git a/src/GraphicObjects/TemplatedControl.cs b/src/GraphicObjects/TemplatedControl.cs
index 037cae32..08413709 100644
--- a/src/GraphicObjects/TemplatedControl.cs
+++ b/src/GraphicObjects/TemplatedControl.cs
@@ -62,7 +62,7 @@ namespace Crow
 		public TemplatedControl (Interface iface) : base(iface){}
 		#endregion
 
-		string _template;
+		string templatePath;
 		string caption;
 
 		/// <summary>
@@ -71,16 +71,16 @@ namespace Crow
 		//TODO: this property should be renamed 'TemplatePath'
 		[XmlAttributeAttribute][DefaultValue(null)]
 		public string Template {
-			get { return _template; }
+			get { return templatePath; }
 			set {
 				if (Template == value)
 					return;
-				_template = value;
+				templatePath = value;
 
-				if (string.IsNullOrEmpty(_template))
-					loadTemplate ();
-				else
-					loadTemplate (IFace.Load (_template));
+//				if (string.IsNullOrEmpty(templatePath))
+//					loadTemplate ();
+//				else
+//					loadTemplate (IFace.Load (templatePath));
 			}
 		}
 		/// <summary>
@@ -99,10 +99,10 @@ namespace Crow
 
 		#region GraphicObject overrides
 
-		public override void Initialize ()
+		public override void Initialize (Interface iFace)
 		{
-			loadTemplate ();
-			base.Initialize ();
+			loadTemplate (iFace);
+			base.Initialize (iFace);
 		}
 		/// <summary>
 		/// override search method from GraphicObject to prevent
@@ -149,15 +149,15 @@ namespace Crow
 		/// Loads the template.
 		/// </summary>
 		/// <param name="template">Optional template instance</param>
-		protected virtual void loadTemplate(GraphicObject template = null)
+		protected virtual void loadTemplate(Interface iFace, GraphicObject template = null)
 		{
 			if (this.child != null)//template change, bindings has to be reset
 				this.ClearTemplateBinding();
 			
 			if (template == null) {
-				if (!IFace.DefaultTemplates.ContainsKey (this.GetType ().FullName))
+				if (!iFace.DefaultTemplates.ContainsKey (this.GetType ().FullName))
 					throw new Exception (string.Format ("No default template found for '{0}'", this.GetType ().FullName));
-				this.SetChild (IFace.Load (IFace.DefaultTemplates[this.GetType ().FullName]));
+				this.SetChild (iFace.Load (iFace.DefaultTemplates[this.GetType ().FullName]));
 			}else
 				this.SetChild (template);
 		}
diff --git a/src/GraphicObjects/TemplatedGroup.cs b/src/GraphicObjects/TemplatedGroup.cs
index 6067f0ac..afdee4c2 100644
--- a/src/GraphicObjects/TemplatedGroup.cs
+++ b/src/GraphicObjects/TemplatedGroup.cs
@@ -110,9 +110,9 @@ namespace Crow
 				NotifyValueChanged("ItemTemplate", _itemTemplate);
 			}
 		}
-		protected override void loadTemplate(GraphicObject template = null)
+		protected override void loadTemplate(Interface iFace, GraphicObject template = null)
 		{
-			base.loadTemplate (template);
+			base.loadTemplate (iFace, template);
 
 			items = this.child.FindByName ("ItemsContainer") as Group;
 			if (items == null)
diff --git a/src/GraphicObjects/Window.cs b/src/GraphicObjects/Window.cs
index 56632ff3..fe033cc2 100644
--- a/src/GraphicObjects/Window.cs
+++ b/src/GraphicObjects/Window.cs
@@ -73,9 +73,9 @@ namespace Crow
 		#endregion
 
 		#region TemplatedContainer overrides
-		protected override void loadTemplate(GraphicObject template = null)
+		protected override void loadTemplate(Interface iFace, GraphicObject template = null)
 		{
-			base.loadTemplate (template);
+			base.loadTemplate (iFace, template);
 
 			NotifyValueChanged ("ShowNormal", false);
 			NotifyValueChanged ("ShowMinimize", true);
@@ -433,7 +433,7 @@ namespace Crow
 
 		protected void butQuitPress (object sender, MouseButtonEventArgs e)
 		{
-			IFace.MouseCursor = XCursor.Default;
+			//IFace.MouseCursor = XCursor.Default;
 			close ();
 		}
 
diff --git a/src/IML/IMLContext.cs b/src/IML/IMLContext.cs
index aa4dee2f..9bfd13d0 100644
--- a/src/IML/IMLContext.cs
+++ b/src/IML/IMLContext.cs
@@ -77,7 +77,7 @@ namespace Crow.IML
 				throw new Exception ("No default parameterless constructor found in " + rootType.Name);			
 			il.Emit (OpCodes.Newobj, ci);
 			il.Emit (OpCodes.Stloc_0);
-			CompilerServices.emitSetCurInterface (il);
+			//CompilerServices.emitSetCurInterface (il);
 		}
 
 		public NodeAddress CurrentNodeAddress {
diff --git a/src/Instantiator.cs b/src/Instantiator.cs
index 001832b1..388c5d76 100644
--- a/src/Instantiator.cs
+++ b/src/Instantiator.cs
@@ -314,6 +314,7 @@ namespace Crow.IML
 
 				if (!inlineTemplate) {//load from path or default template
 					ctx.il.Emit (OpCodes.Ldloc_0);//Load  current templatedControl ref
+					ctx.il.Emit (OpCodes.Ldarg_1);//load currentInterface
 					if (string.IsNullOrEmpty (templatePath)) {
 						ctx.il.Emit (OpCodes.Ldnull);//default template loading
 					} else {
@@ -438,6 +439,7 @@ namespace Crow.IML
 					}
 				}
 				ctx.il.Emit (OpCodes.Ldloc_0);
+				ctx.il.Emit (OpCodes.Ldarg_1);//load currentInterface
 				ctx.il.Emit (OpCodes.Callvirt, CompilerServices.miLoadDefaultVals);
 				#endregion
 
@@ -519,19 +521,22 @@ namespace Crow.IML
 						throw new Exception (reader.Name + " type not found");
 					ConstructorInfo ci = t.GetConstructor (
 						                     BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public,  
-						null, Type.EmptyTypes, null);
+						                     null, Type.EmptyTypes, null);
 					if (ci == null)
 						throw new Exception ("No default parameterless constructor found in " + t.Name);					
 					ctx.il.Emit (OpCodes.Newobj, ci);
 					ctx.il.Emit (OpCodes.Stloc_0);//child is now loc_0
-					CompilerServices.emitSetCurInterface (ctx.il);
+					//CompilerServices.emitSetCurInterface (ctx.il);
 
 					ctx.nodesStack.Push (new Node (t, nodeIdx));
 					emitLoader (reader, ctx);
 					ctx.nodesStack.Pop ();
 
+					MethodInfo miAdd = ctx.nodesStack.Peek ().GetAddMethod (nodeIdx);
+					if (miAdd == CompilerServices.miLoadTmp)
+						ctx.il.Emit (OpCodes.Ldarg_1);//push cur iface if tmp load
 					ctx.il.Emit (OpCodes.Ldloc_0);//load child on stack for parenting
-					ctx.il.Emit (OpCodes.Callvirt, ctx.nodesStack.Peek().GetAddMethod(nodeIdx));
+					ctx.il.Emit (OpCodes.Callvirt, miAdd);
 					ctx.il.Emit (OpCodes.Stloc_0); //reset local to current go
 
 					nodeIdx++;
diff --git a/src/Interface.cs b/src/Interface.cs
index 3b864288..66edf3f9 100644
--- a/src/Interface.cs
+++ b/src/Interface.cs
@@ -157,8 +157,8 @@ namespace Crow
 			loadCursors ();
 			loadStyling ();
 			findAvailableTemplates ();
-			initTooltip ();
-			initContextMenus ();
+//			initTooltip ();
+//			initContextMenus ();
 		}
 
 		#region Static and constants
@@ -1259,6 +1259,9 @@ namespace Crow
 		#endregion
 
 		#region ILayoutable implementation
+		/// </summary>
+		public Interface IFace { get { return this; }}
+
 		public virtual bool PointIsIn(ref Point m)
 		{
 			return true;
diff --git a/src/Picture.cs b/src/Picture.cs
index 69ff2574..0cfe1902 100644
--- a/src/Picture.cs
+++ b/src/Picture.cs
@@ -98,7 +98,7 @@ namespace Crow
 		/// load the image for rendering from the stream given as argument
 		/// </summary>
 		/// <param name="stream">picture stream</param>
-		public abstract void Load(Interface iface, string path);
+		public abstract void Load(Interface iface);
 		#endregion
 
 		/// <summary>
diff --git a/src/SvgPicture.cs b/src/SvgPicture.cs
index a7362582..253e46d1 100644
--- a/src/SvgPicture.cs
+++ b/src/SvgPicture.cs
@@ -51,23 +51,29 @@ namespace Crow
 		{}
 		#endregion
 
-		public override void Load (Interface iface, string path)
-		{
-			Path = path;
-			if (sharedResources.ContainsKey (path)) {
-				sharedPicture sp = sharedResources [path];
+		public override void Load (Interface iface)
+		{			
+			Loaded = false;
+			if (iface == null)
+				return;			
+			if (sharedResources.ContainsKey (Path)) {
+				sharedPicture sp = sharedResources [Path];
 				hSVG = (Rsvg.Handle)sp.Data;
 				Dimensions = sp.Dims;
 			} else {
-				using (Stream stream = iface.GetStreamFromPath (path)) {
-					using (MemoryStream ms = new MemoryStream ()) {
-						stream.CopyTo (ms);
-
-						hSVG = new Rsvg.Handle (ms.ToArray ());
-						Dimensions = new Size (hSVG.Dimensions.Width, hSVG.Dimensions.Height);
+				try {
+					using (Stream stream = iface.GetStreamFromPath (Path)) {
+						using (MemoryStream ms = new MemoryStream ()) {
+							stream.CopyTo (ms);
+
+							hSVG = new Rsvg.Handle (ms.ToArray ());
+							Dimensions = new Size (hSVG.Dimensions.Width, hSVG.Dimensions.Height);
+						}
 					}
+					sharedResources [Path] = new sharedPicture (hSVG, Dimensions);
+				} catch (Exception ex) {
+					
 				}
-				sharedResources [path] = new sharedPicture (hSVG, Dimensions);
 			}
 			Loaded = true;
 		}
-- 
2.47.3