aboutsummaryrefslogtreecommitdiffstatsci
path: root/src/GraphicObjects
diff options
context:
space:
mode:
authorjpbruyere <jp.bruyere@hotmail.com>2016-02-19 11:06:44 +0100
committerjpbruyere <jp.bruyere@hotmail.com>2016-03-01 05:06:16 +0100
commit328c6d4eab1127cd9799540f253deda66060b68a (patch)
treeeeb1c888ed94c444d673f9f827b4df447e249ea4 /src/GraphicObjects
parent2cb0e7507022aa0449c1af264230784039b24e15 (diff)
free Crow base from OpenTK
Diffstat (limited to 'src/GraphicObjects')
-rw-r--r--src/GraphicObjects/FileDialog.cs6
-rw-r--r--src/GraphicObjects/Window.cs23
2 files changed, 14 insertions, 15 deletions
diff --git a/src/GraphicObjects/FileDialog.cs b/src/GraphicObjects/FileDialog.cs
index b1c93119..da85580a 100644
--- a/src/GraphicObjects/FileDialog.cs
+++ b/src/GraphicObjects/FileDialog.cs
@@ -89,7 +89,7 @@ namespace Crow
}
public void Show(){
- OpenTKGameWindow.currentWindow.AddWidget(window);
+ //.AddWidget(window);
}
void OnSelectedItemChanged (object sender, SelectionChangeEventArgs e)
@@ -104,8 +104,8 @@ namespace Crow
{
selectedFile = e.NewValue as FileInfo;
}
- void onFileSelect(object sender, OpenTK.Input.MouseButtonEventArgs e){
- OpenTKGameWindow.currentWindow.DeleteWidget(window);
+ void onFileSelect(object sender, MouseButtonEventArgs e){
+ //OpenTKGameWindow.currentWindow.DeleteWidget(window);
}
}
public class DirContainer: IValueChange
diff --git a/src/GraphicObjects/Window.cs b/src/GraphicObjects/Window.cs
index 757ee080..617670fc 100644
--- a/src/GraphicObjects/Window.cs
+++ b/src/GraphicObjects/Window.cs
@@ -83,7 +83,7 @@ namespace Crow
{
base.onMouseMove (sender, e);
- OpenTKGameWindow otkgw = HostContainer as OpenTKGameWindow;
+ IGOLibHost otkgw = HostContainer;
if (e.Mouse.IsButtonDown (MouseButton.Left)) {
if (!HasFocus)
@@ -176,31 +176,31 @@ namespace Crow
if (currentDirection != lastDir) {
switch (currentDirection) {
case Direction.None:
- otkgw.Cursor = XCursor.Default;
+ otkgw.MouseCursor = XCursor.Default;
break;
case Direction.N:
- otkgw.Cursor = XCursor.V;
+ otkgw.MouseCursor = XCursor.V;
break;
case Direction.S:
- otkgw.Cursor = XCursor.V;
+ otkgw.MouseCursor = XCursor.V;
break;
case Direction.E:
- otkgw.Cursor = XCursor.H;
+ otkgw.MouseCursor = XCursor.H;
break;
case Direction.W:
- otkgw.Cursor = XCursor.H;
+ otkgw.MouseCursor = XCursor.H;
break;
case Direction.NW:
- otkgw.Cursor = XCursor.NW;
+ otkgw.MouseCursor = XCursor.NW;
break;
case Direction.NE:
- otkgw.Cursor = XCursor.NE;
+ otkgw.MouseCursor = XCursor.NE;
break;
case Direction.SW:
- otkgw.Cursor = XCursor.SW;
+ otkgw.MouseCursor = XCursor.SW;
break;
case Direction.SE:
- otkgw.Cursor = XCursor.SE;
+ otkgw.MouseCursor = XCursor.SE;
break;
}
}
@@ -210,8 +210,7 @@ namespace Crow
{
base.onMouseLeave (sender, e);
currentDirection = Direction.None;
- OpenTKGameWindow otkgw = HostContainer as OpenTKGameWindow;
- otkgw.Cursor = XCursor.Default;
+ HostContainer.MouseCursor = XCursor.Default;
}
protected override void loadTemplate(GraphicObject template = null)