From: jpbruyere Date: Tue, 1 Mar 2016 04:46:11 +0000 (+0100) Subject: update mouse cursor for OTK container X-Git-Tag: v0.4~93^2~9 X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=f2b0b19294346a11dc32c7ef91e3e92712285791;p=jp%2Fcrow.git update mouse cursor for OTK container --- diff --git a/OTKCrow/OpenTKGameWindow.cs b/OTKCrow/OpenTKGameWindow.cs index 518c2bc7..c3240b99 100644 --- a/OTKCrow/OpenTKGameWindow.cs +++ b/OTKCrow/OpenTKGameWindow.cs @@ -104,6 +104,7 @@ namespace Crow { CrowInterface = new Interface (); CrowInterface.Quit += Quit; + CrowInterface.MouseCursorChanged += CrowInterface_MouseCursorChanged; } #endregion @@ -111,6 +112,15 @@ namespace Crow { this.Exit (); } + void CrowInterface_MouseCursorChanged (object sender, MouseCursorChangedEventArgs e) + { + this.Cursor = new MouseCursor( + (int)e.NewCursor.Xhot, + (int)e.NewCursor.Yhot, + (int)e.NewCursor.Width, + (int)e.NewCursor.Height, + e.NewCursor.data); + } #region Events //those events are raised only if mouse isn't in a graphic object diff --git a/src/Interface.cs b/src/Interface.cs index 53417ee4..4007cce0 100644 --- a/src/Interface.cs +++ b/src/Interface.cs @@ -458,7 +458,7 @@ namespace Crow if (value == cursor) return; cursor = value; - MouseCursorChanged.Raise (this,new MouseCursorChangedEventArgs(value)); + MouseCursorChanged.Raise (this,new MouseCursorChangedEventArgs(cursor)); } } public bool ProcessMouseMove(int x, int y) diff --git a/src/MouseCursorChangedEventArgs.cs b/src/MouseCursorChangedEventArgs.cs index b39d4a57..5bfd1232 100644 --- a/src/MouseCursorChangedEventArgs.cs +++ b/src/MouseCursorChangedEventArgs.cs @@ -25,9 +25,9 @@ namespace Crow public class MouseCursorChangedEventArgs : EventArgs { public XCursor NewCursor; - public MouseCursorChangedEventArgs (XCursor NewCursor) : base() + public MouseCursorChangedEventArgs (XCursor newCursor) : base() { - NewCursor = NewCursor; + NewCursor = newCursor; } } }