CrowIDE WIP, context commands, tooltips, PointIsIn(ref point), configuration no longer static.

also:
- remove default null value for datasource
- dschange sender changed in group and privateContainer
- try closing menuItem, should debug
- Contains search also template in TemplatedContainer
- change in nodeAddress: expresion starting with '/' means current node
- MouseEventArgs CTOR with one source button
- RemoveWidget trigger check HoverWidget
- Orientation binding in Menu template

9 files changed, 125 insertions, 47 deletions

diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs
index ad02a544..ad9392b0 100644
--- a/src/GraphicObjects/GraphicObject.cs
+++ b/src/GraphicObjects/GraphicObject.cs
@@ -190,7 +190,8 @@ namespace Crow
 		bool isDragged;
 		bool allowDrag;
 		bool allowDrop;
-
+		string tooltip;
+		IList<Command> contextCommands;
 		#endregion
 
 		#region public fields
@@ -764,7 +765,7 @@ namespace Crow
 		/// Seek first logical tree upward if logicalParent is set, or seek graphic tree for
 		/// a not null dataSource that will be active for all descendants having dataSource=null
 		/// </summary>
-		[XmlAttributeAttribute][DefaultValue(null)]
+		[XmlAttributeAttribute]//[DefaultValue(null)]
 		public virtual object DataSource {
 			set {
 				if (DataSource == value)
@@ -774,6 +775,10 @@ namespace Crow
 				dataSource = value;
 				dse.NewDataSource = DataSource;
 
+				//prevent setting null causing stack overflow in specific case
+				if (dse.NewDataSource == dse.OldDataSource)
+					return;
+
 				OnDataSourceChanged (this, dse);
 
 				NotifyValueChanged ("DataSource", DataSource);
@@ -813,7 +818,6 @@ namespace Crow
 				NotifyValueChanged ("Style", style);
 			}
 		}
-		string tooltip;
 		[XmlAttributeAttribute]
 		public virtual string Tooltip {
 			get { return tooltip; }
@@ -824,6 +828,16 @@ namespace Crow
 				NotifyValueChanged("Tooltip", tooltip);
 			}
 		}
+		[XmlAttributeAttribute]
+		public IList<Command> ContextCommands {
+			get { return contextCommands; }
+			set {
+				if (contextCommands == value)
+					return;
+				contextCommands = value;
+				NotifyValueChanged("ContextCommands", contextCommands);
+			}
+		}
 		#endregion
 
 		#region Default and Style Values loading
@@ -1499,24 +1513,45 @@ namespace Crow
         #endregion
 
 		#region Mouse handling
+		public virtual bool PointIsIn(ref Point m)
+		{			
+			if (!(Visible & isEnabled)||IsDragged)
+				return false;				
+			ILayoutable tmp = Parent;
+			//while (tmp != null){
+			if (!parent.PointIsIn(ref m))
+				return false;
+			m -= (parent.getSlot().Position + parent.ClientRectangle.Position) ;
+
+			return Slot.ContainsOrIsEqual (m);					
+		}
 		public virtual bool MouseIsIn(Point m)
 		{
-			try {
-				if (!(Visible & isEnabled)||IsDragged)
-					return false;
-				if (ScreenCoordinates (Slot).ContainsOrIsEqual (m)) {
-					Scroller scr = Parent as Scroller;
-					if (scr == null) {
-						if (Parent is GraphicObject)
-							return (Parent as GraphicObject).MouseIsIn (m);
-						else return true;
-					}
-					return scr.MouseIsIn (scr.savedMousePos);
-				}
-			} catch (Exception ex) {
-				return false;
-			}
-			return false;
+			Point p = m;
+			return PointIsIn (ref m);
+//			try {
+//				if (!(Visible & isEnabled)||IsDragged)
+//					return false;				
+//				ILayoutable tmp = Parent;
+//				//while (tmp != null){
+//				if (!parent.MouseIsIn(m))
+//					return false;
+//				m -= (parent.getSlot().Position + parent.ClientRectangle.Position) ;
+//
+//				return slot.ContainsOrIsEqual (m);
+////					Scroller scr = tmp as Scroller;						
+////					if (scr != null) {
+////						m.Y += scr.ScrollY;
+////						m.X += scr.ScrollX;
+////					}					
+////					tmp = tmp.Parent;
+//				//}
+//
+//				//}
+//			} catch (Exception ex) {
+//				return false;
+//			}
+			//return false;
 		}
 		public virtual void checkHoverWidget(MouseMoveEventArgs e)
 		{
@@ -1525,7 +1560,7 @@ namespace Crow
 				onMouseEnter (this, e);
 			}
 
-			this.onMouseMove (this, e);//without this, window border doesn't work, should be removed
+			//this.onMouseMove (this, e);//without this, window border doesn't work, should be removed
 		}
 		public virtual void onMouseMove(object sender, MouseMoveEventArgs e)
 		{
@@ -1553,6 +1588,8 @@ namespace Crow
 				if (be.Focused == null) {
 					be.Focused = this;
 					CurrentInterface.FocusedWidget = this;
+					if (e.Button == MouseButton.Right && this.ContextCommands != null)
+						CurrentInterface.ShowContextMenu (this);					
 				}
 			}
 			//bubble event to the top
diff --git a/src/GraphicObjects/Group.cs b/src/GraphicObjects/Group.cs
index c944eba2..3802a4d9 100644
--- a/src/GraphicObjects/Group.cs
+++ b/src/GraphicObjects/Group.cs
@@ -147,7 +147,7 @@ namespace Crow
 			lock (children) {
 				foreach (GraphicObject g in children)
 					if (g.localDataSourceIsNull & g.localLogicalParentIsNull)
-						g.OnDataSourceChanged (sender, e);
+						g.OnDataSourceChanged (g, e);
 			}
 		}
 		public override GraphicObject FindByName (string nameToFind)
diff --git a/src/GraphicObjects/ILayoutable.cs b/src/GraphicObjects/ILayoutable.cs
index c0c1cf5c..c8aa38fb 100644
--- a/src/GraphicObjects/ILayoutable.cs
+++ b/src/GraphicObjects/ILayoutable.cs
@@ -45,7 +45,7 @@ namespace Crow
 		void RegisterForLayouting(LayoutingType layoutType);
 		void RegisterClip(Rectangle clip);
 		bool UpdateLayout(LayoutingType layoutType);
-
+		bool PointIsIn(ref Point m);
 
 		Rectangle ContextCoordinates(Rectangle r);
 		Rectangle ScreenCoordinates (Rectangle r);
diff --git a/src/GraphicObjects/MenuItem.cs b/src/GraphicObjects/MenuItem.cs
index ae27b013..5c9665fb 100644
--- a/src/GraphicObjects/MenuItem.cs
+++ b/src/GraphicObjects/MenuItem.cs
@@ -40,7 +40,6 @@ namespace Crow
 		public event EventHandler Open;
 		public event EventHandler Close;
 
-		string caption;
 		Command command;
 		Picture icon;
 		bool isOpened;
@@ -58,7 +57,8 @@ namespace Crow
 
 				if (isOpened) {
 					onOpen (this, null);
-					(LogicalParent as Menu).AutomaticOpenning = true;
+					if (LogicalParent is Menu)
+						(LogicalParent as Menu).AutomaticOpenning = true;
 				}else
 					onClose (this, null);
 			}
@@ -143,8 +143,10 @@ namespace Crow
 		}
 		void onMI_Click (object sender, MouseButtonEventArgs e)
 		{
-			if (command != null)
+			if (command != null) {
 				command.Execute ();
+				closeMenu ();
+			}
 			if(!IsOpened)
 				(LogicalParent as Menu).AutomaticOpenning = false;
 		}
@@ -152,6 +154,7 @@ namespace Crow
 			Open.Raise (this, null);
 		}
 		protected virtual void onClose (object sender, EventArgs e){
+			System.Diagnostics.Debug.WriteLine ("close: " + this.ToString());
 			Close.Raise (this, null);
 		}
 		public override bool MouseIsIn (Point m)
@@ -170,6 +173,14 @@ namespace Crow
 				IsOpened = false;
 			base.onMouseLeave (this, e);
 		}
+
+		void closeMenu () {
+			MenuItem tmp = LogicalParent as MenuItem;
+			while (tmp != null) {
+				tmp.IsOpened = false;
+				tmp = tmp.LogicalParent as MenuItem;
+			}
+		}
 	}
 }
 
diff --git a/src/GraphicObjects/Popper.cs b/src/GraphicObjects/Popper.cs
index 41210dc5..be4a19b8 100644
--- a/src/GraphicObjects/Popper.cs
+++ b/src/GraphicObjects/Popper.cs
@@ -192,6 +192,12 @@ namespace Crow
 			base.onMouseLeave (this, e);
 			IsPopped = false;
 		}
+//		public override bool PointIsIn (ref Point m)
+//		{
+//			if (!base.PointIsIn (ref m))
+//				return false;
+//			
+//		}
 		public override bool MouseIsIn (Point m)
 		{
 			bool isInContent = false;
diff --git a/src/GraphicObjects/PrivateContainer.cs b/src/GraphicObjects/PrivateContainer.cs
index e76b57a8..8383a274 100644
--- a/src/GraphicObjects/PrivateContainer.cs
+++ b/src/GraphicObjects/PrivateContainer.cs
@@ -92,7 +92,7 @@ namespace Crow
 			base.OnDataSourceChanged (this, e);
 			if (child != null)
 			if (child.localDataSourceIsNull & child.localLogicalParentIsNull)
-					child.OnDataSourceChanged (sender, e);
+				child.OnDataSourceChanged (child, e);
 		}
 		public override bool UpdateLayout (LayoutingType layoutType)
 		{
diff --git a/src/GraphicObjects/Scroller.cs b/src/GraphicObjects/Scroller.cs
index ec3bc47d..a4e1b816 100644
--- a/src/GraphicObjects/Scroller.cs
+++ b/src/GraphicObjects/Scroller.cs
@@ -219,17 +219,39 @@ namespace Crow
 		}
 
 		#region Mouse handling
-		internal Point savedMousePos;
-		public override bool MouseIsIn (Point m)
-		{
-			return Visible ? base.ScreenCoordinates(Slot).ContainsOrIsEqual (m) : false;
-		}
-		public override void checkHoverWidget (MouseMoveEventArgs e)
+		//internal Point savedMousePos;
+
+		public override bool PointIsIn (ref Point m)
 		{
-			savedMousePos = e.Position;
-			Point m = e.Position - new Point (ScrollX, ScrollY);
-			base.checkHoverWidget (new MouseMoveEventArgs(m.X,m.Y,e.XDelta,e.YDelta));
+//			if (!(Visible & IsEnabled)||IsDragged)
+//				return false;				
+//			ILayoutable tmp = Parent;
+//			//while (tmp != null){
+//			if (!Parent.PointIsIn(ref m))
+//				return false;
+//			m -= (Parent.getSlot().Position + Parent.ClientRectangle.Position);
+//			if (!Slot.ContainsOrIsEqual (m) || child==null)
+//				return false;
+//			m += new Point (ScrollX, ScrollY);
+//			return true;
+			if (!base.PointIsIn(ref m))
+				return false;
+			//m -= (Parent.getSlot().Position + Parent.ClientRectangle.Position);
+			if (!Slot.ContainsOrIsEqual (m) || child==null)
+				return false;
+			m += new Point (ScrollX, ScrollY);
+			return true;
 		}
+//		public override bool MouseIsIn (Point m)
+//		{
+//			return Visible ? base.ScreenCoordinates(Slot).ContainsOrIsEqual (m) : false;
+//		}
+//		public override void checkHoverWidget (MouseMoveEventArgs e)
+//		{
+//			savedMousePos = e.Position;
+//			Point m = e.Position - new Point (ScrollX, ScrollY);
+//			base.checkHoverWidget (new MouseMoveEventArgs(m.X,m.Y,e.XDelta,e.YDelta));
+//		}
 		public override void onMouseWheel (object sender, MouseWheelEventArgs e)
 		{
 			if (Child == null)
@@ -240,12 +262,12 @@ namespace Crow
 			if (HorizontalScrolling )
 				ScrollX -= e.Delta * ScrollSpeed;
 		}
-		public override void onMouseMove (object sender, MouseMoveEventArgs e)
-		{
-			savedMousePos.X += e.XDelta;
-			savedMousePos.Y += e.YDelta;
-			base.onMouseMove (sender, new MouseMoveEventArgs(savedMousePos.X,savedMousePos.Y,e.XDelta,e.YDelta));
-		}
+//		public override void onMouseMove (object sender, MouseMoveEventArgs e)
+//		{
+//			savedMousePos.X += e.XDelta;
+//			savedMousePos.Y += e.YDelta;
+//			base.onMouseMove (sender, new MouseMoveEventArgs(savedMousePos.X,savedMousePos.Y,e.XDelta,e.YDelta));
+//		}
 		public override void RegisterClip (Rectangle clip)
 		{
 			base.RegisterClip (clip - new Point(ScrollX,ScrollY));
diff --git a/src/GraphicObjects/TemplatedContainer.cs b/src/GraphicObjects/TemplatedContainer.cs
index 31bbc436..3e0dd801 100644
--- a/src/GraphicObjects/TemplatedContainer.cs
+++ b/src/GraphicObjects/TemplatedContainer.cs
@@ -77,12 +77,11 @@ namespace Crow
 		}
 		public override bool Contains (GraphicObject goToFind)
 		{
-			if (Content == null)
-				return base.Contains (goToFind);
-
 			if (Content == goToFind)
 				return true;
-			return Content.Contains (goToFind);
+			if (Content?.Contains (goToFind) == true)
+				return true;
+			return base.Contains (goToFind);
 		}
 		#endregion
 	}
diff --git a/src/GraphicObjects/TemplatedGroup.cs b/src/GraphicObjects/TemplatedGroup.cs
index 069303dd..ef099f93 100644
--- a/src/GraphicObjects/TemplatedGroup.cs
+++ b/src/GraphicObjects/TemplatedGroup.cs
@@ -344,7 +344,9 @@ namespace Crow
 			#endif
 
 			Group page;
-			if (typeof(TabView).IsAssignableFrom (items.GetType ())||typeof(Wrapper).IsAssignableFrom (items.GetType ())) {
+			if (typeof(TabView).IsAssignableFrom (items.GetType ())||
+				typeof(Menu).IsAssignableFrom (this.GetType())||
+				typeof(Wrapper).IsAssignableFrom (items.GetType ())) {
 				page = items;
 				itemPerPage = int.MaxValue;
 			} else if (typeof(GenericStack).IsAssignableFrom (items.GetType ())) {
@@ -425,7 +427,8 @@ namespace Crow
 			lock (CurrentInterface.LayoutMutex) {
 				g = iTemp.CreateInstance(CurrentInterface);
 				page.AddChild (g);
-				//g.LogicalParent = this;
+//				if (isPaged)
+//					g.LogicalParent = this;
 				registerItemClick (g);
 			}