* XCursor.cs:

* move:
* help:
* hand:
* cross:
* arrow:
* top_left_corner:
* top_right_corner:
* bottom_left_corner:
* bottom_right_corner: Mouse xCursors

* Window.goml:
* Checkbox.goml:
* Group.cs:
* Popper.cs:
* Checkbox.cs:
* Expandable.cs:
* RadioButton.cs:
* GraphicObject.cs:
* PrivateContainer.cs:
* TemplatedControl.cs: Focus handling improvment

* GOLib.csproj:
* OpenTKGameWindow.cs:
* Window.cs: cursors

9 files changed, 55 insertions, 30 deletions

diff --git a/src/GraphicObjects/Checkbox.cs b/src/GraphicObjects/Checkbox.cs
index 930fce1a..f6b7bae3 100644
--- a/src/GraphicObjects/Checkbox.cs
+++ b/src/GraphicObjects/Checkbox.cs
@@ -23,7 +23,7 @@ namespace go
 		Image _image;

 

 		public Checkbox() : base()

-		{

+		{			

 		}	

 

 		protected override void loadTemplate(GraphicObject template = null)

@@ -64,6 +64,12 @@ namespace go
             }

         }

 

+		[XmlAttributeAttribute()][DefaultValue(true)]//overiden to get default to true

+		public override bool Focusable

+		{

+			get { return base.Focusable; }

+			set { base.Focusable = value; }

+		}

 		public override void onMouseClick (object sender, MouseButtonEventArgs e)

 		{

 			IsChecked = !IsChecked;

diff --git a/src/GraphicObjects/Expandable.cs b/src/GraphicObjects/Expandable.cs
index 8b3f4b1a..77054897 100644
--- a/src/GraphicObjects/Expandable.cs
+++ b/src/GraphicObjects/Expandable.cs
@@ -58,7 +58,12 @@ namespace go
 //			this.Collapse += (object sender, EventArgs e) => {};

 

 		}

-			

+		[XmlAttributeAttribute()][DefaultValue(true)]//overiden to get default to true

+		public override bool Focusable

+		{

+			get { return base.Focusable; }

+			set { base.Focusable = value; }

+		}

 

 		[XmlAttributeAttribute()][DefaultValue("Expandable")]

 		public string Title {

diff --git a/src/GraphicObjects/GraphicObject.cs b/src/GraphicObjects/GraphicObject.cs
index e1e2963b..e1972669 100644
--- a/src/GraphicObjects/GraphicObject.cs
+++ b/src/GraphicObjects/GraphicObject.cs
@@ -659,7 +659,11 @@ namespace go
 		#region Mouse handling

 		public virtual bool MouseIsIn(Point m)

 		{

-			return Visible & Focusable ? ScreenCoordinates(Slot).ContainsOrIsEqual (m) : false; 

+			return Visible ? ScreenCoordinates(Slot).ContainsOrIsEqual (m) : false; 

+		}

+		internal virtual void checkHoverWidget(Point m)

+		{

+			

 		}

 		public virtual void onMouseMove(object sender, MouseMoveEventArgs e)

 		{

diff --git a/src/GraphicObjects/Group.cs b/src/GraphicObjects/Group.cs
index e7a4b2b6..e2d64c89 100644
--- a/src/GraphicObjects/Group.cs
+++ b/src/GraphicObjects/Group.cs
@@ -65,12 +65,6 @@ namespace go
 		}

 			

 		#region GraphicObject overrides

-		[XmlAttributeAttribute()][DefaultValue(true)]//overiden to get default to true

-		public override bool Focusable

-		{

-			get { return base.Focusable; }

-			set { base.Focusable = value; }

-		}

 		[XmlIgnore]public override bool DrawingIsValid {

 			get {

 				if (!base.DrawingIsValid)

diff --git a/src/GraphicObjects/Popper.cs b/src/GraphicObjects/Popper.cs
index 0bbe3a52..f03a166a 100644
--- a/src/GraphicObjects/Popper.cs
+++ b/src/GraphicObjects/Popper.cs
@@ -52,7 +52,12 @@ namespace go
 			this.Unpop += (object sender, EventArgs e) => {_image.SvgSub = "collapsed";};

 

 		}

-			

+		[XmlAttributeAttribute()][DefaultValue(true)]//overiden to get default to true

+		public override bool Focusable

+		{

+			get { return base.Focusable; }

+			set { base.Focusable = value; }

+		}

 

 		[XmlAttributeAttribute()][DefaultValue("Popper")]

 		public string Title {

diff --git a/src/GraphicObjects/PrivateContainer.cs b/src/GraphicObjects/PrivateContainer.cs
index 025934f9..f863fae8 100644
--- a/src/GraphicObjects/PrivateContainer.cs
+++ b/src/GraphicObjects/PrivateContainer.cs
@@ -67,14 +67,6 @@ namespace go
 		}
 
 		#region GraphicObject Overrides
-		//check if not causing problems
-		[XmlAttributeAttribute()][DefaultValue(true)]
-		public override bool Focusable
-		{
-			get { return base.Focusable; }
-			set { base.Focusable = value; }
-		}
-
 		public override GraphicObject FindByName (string nameToFind)
 		{
 			if (Name == nameToFind)
diff --git a/src/GraphicObjects/RadioButton.cs b/src/GraphicObjects/RadioButton.cs
index 8c8000e2..9d7ef83e 100644
--- a/src/GraphicObjects/RadioButton.cs
+++ b/src/GraphicObjects/RadioButton.cs
@@ -35,6 +35,12 @@ namespace go
 			_image.SvgSub = "unchecked";

 		}

 			

+		[XmlAttributeAttribute()][DefaultValue(true)]//overiden to get default to true

+		public override bool Focusable

+		{

+			get { return base.Focusable; }

+			set { base.Focusable = value; }

+		}

 

 		[XmlAttributeAttribute][DefaultValue("RadioButton")]

 		public string Caption {

diff --git a/src/GraphicObjects/TemplatedControl.cs b/src/GraphicObjects/TemplatedControl.cs
index d8af0bdf..37da50cf 100644
--- a/src/GraphicObjects/TemplatedControl.cs
+++ b/src/GraphicObjects/TemplatedControl.cs
@@ -75,7 +75,6 @@ namespace go
 			if (child == null)//trigger loading of default template if child is empty
 				loadTemplate ();
 			base.loadDefaultValues ();
-			this.Focusable = true;
 		}
 
 		public override GraphicObject FindByName (string nameToFind)
diff --git a/src/GraphicObjects/Window.cs b/src/GraphicObjects/Window.cs
index 0fd2b780..ad3ec5bb 100644
--- a/src/GraphicObjects/Window.cs
+++ b/src/GraphicObjects/Window.cs
@@ -36,23 +36,37 @@ namespace go
 
 		void Window_MouseMove (object sender, OpenTK.Input.MouseMoveEventArgs e)
 		{
-			
-//			if ((e.Position - this.Slot.TopLeft).Length < 3)
-//				System.Windows.Forms.Cursor.Current = System.Windows.Forms.Cursors.SizeNWSE;
-//			else
-//				System.Windows.Forms.Cursor.Current = System.Windows.Forms.Cursors.Default;
-			
-			if (!e.Mouse.IsButtonDown (MouseButton.Left))
-				return;
-			
-			//
 
-			System.Windows.Forms.Cursor.Show();// = System.Windows.Forms.Cursors.SizeAll;
 
+		}
+		public override void onMouseMove (object sender, MouseMoveEventArgs e)
+		{
+			base.onMouseMove (sender, e);
+
+
+			OpenTKGameWindow otkgw = TopContainer as OpenTKGameWindow;
+
+			if ((e.Position - this.Slot.TopLeft).Length < 5)
+				otkgw.Cursor = XCursor.NW;
+			else
+				otkgw.Cursor = XCursor.Cross;
+
+
+			if (TopContainer.activeWidget != this)
+				return;
+			
 			this.TopContainer.redrawClip.AddRectangle (this.ScreenCoordinates(this.Slot));
 			this.Left += e.XDelta;
 			this.Top += e.YDelta;
 			this.registerForGraphicUpdate ();			
+
+
+		}
+		public override void onMouseLeave (object sender, MouseMoveEventArgs e)
+		{
+			base.onMouseLeave (sender, e);
+			OpenTKGameWindow otkgw = TopContainer as OpenTKGameWindow;
+			otkgw.Cursor = XCursor.Default;
 		}
 
 		protected override void loadTemplate(GraphicObject template = null)