ryujinx-backup/Opentk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[X11] Rebased on develop branch

Browse source
This commit is contained in:
thefiddler 2014-05-15 01:16:28 +02:00
parent 7cce215a4b
commit 692c4c64ff
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Source/OpenTK/OpenTK.csproj
View file

@ -790,7 +790,6 @@
<Compile Include="WindowIcon.cs" />
<Compile Include="Platform\MacOS\Cocoa\NSBitmapFormat.cs" />
<Compile Include="Platform\NativeWindowBase.cs" />
<Compile Include="Input\MouseScrollWheel.cs" />
<Compile Include="Input\MouseEventArgs.cs" />
<Compile Include="Platform\MacOS\Quartz\EventServices.cs" />
<Compile Include="Platform\MacOS\Quartz\DisplayServices.cs">

7
Source/OpenTK/Platform/X11/X11KeyMap.cs
View file

@ -1,6 +1,6 @@
#region License
#region License
//
// Xkb.cs
// X11KeyMap.cs
//
// Author:
// Stefanos Apostolopoulos <stapostol@gmail.com>
@ -693,10 +693,9 @@ namespace OpenTK.Platform.X11
internal bool TranslateKey(ref XKeyEvent e, out Key key)
{
return TranslateKey(e.keycode, out key);
}
internal static MouseButton TranslateButton(int button, out int wheelx, out int wheely)
internal static MouseButton TranslateButton(int button, out float wheelx, out float wheely)
{
wheelx = 0;
wheely = 0;