ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2024-12-23 12:15:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of git://github.com/Goz3rr/opentk into pr/122

Browse source
This commit is contained in:
thefiddler 2014-05-19 08:43:45 +02:00
parent 687fc90c95 0c348d2429
commit d6426f20bd
3 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Source/OpenTK/GameWindowFlags.cs
View file

@ -44,5 +44,10 @@ namespace OpenTK
/// Indicates that the GameWindow should cover the whole screen.
/// </summary>
Fullscreen = 1,
/// <summary>
/// Indicates that the GameWindow should be a fixed window.
/// </summary>
FixedWindow = 2,
}
}

5
Source/OpenTK/NativeWindow.cs
View file

@ -112,6 +112,11 @@ namespace OpenTK
}
WindowState = WindowState.Fullscreen;
}
if ((options & GameWindowFlags.FixedWindow) != 0)
{
WindowBorder = WindowBorder.Fixed;
}
}
#endregion

25
Source/OpenTK/Platform/SDL2/Sdl2NativeWindow.cs
View file

@ -77,7 +77,6 @@ namespace OpenTK.Platform.SDL2
var bounds = device.Bounds;
var flags = TranslateFlags(options);
flags |= WindowFlags.OPENGL;
flags |= WindowFlags.RESIZABLE;
flags |= WindowFlags.HIDDEN;
if (Toolkit.Options.EnableHighResolution)
{
@ -88,6 +87,9 @@ namespace OpenTK.Platform.SDL2
(flags & WindowFlags.FULLSCREEN) != 0)
window_state = WindowState.Fullscreen;
if ((flags & WindowFlags.RESIZABLE) == 0)
window_border = WindowBorder.Fixed;
IntPtr handle;
lock (SDL.Sync)
{
@ -106,17 +108,20 @@ namespace OpenTK.Platform.SDL2
static WindowFlags TranslateFlags(GameWindowFlags flags)
{
switch (flags)
{
case GameWindowFlags.Fullscreen:
if (Sdl2Factory.UseFullscreenDesktop)
return WindowFlags.FULLSCREEN_DESKTOP;
else
return WindowFlags.FULLSCREEN;
WindowFlags windowFlags = WindowFlags.Default;
default:
return WindowFlags.Default;
if ((flags & GameWindowFlags.Fullscreen) != 0)
{
if (Sdl2Factory.UseFullscreenDesktop)
windowFlags |= WindowFlags.FULLSCREEN_DESKTOP;
else
windowFlags |= WindowFlags.FULLSCREEN;
}
if ((flags & GameWindowFlags.FixedWindow) == 0)
windowFlags |= WindowFlags.RESIZABLE;
return windowFlags;
}
static Key TranslateKey(Scancode scan)