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

Fixed regression from conflict resolution.

Browse source
This commit is contained in:
the_fiddler 2008-05-04 16:10:53 +00:00
parent bf8a11f103
commit 6d470e90a8
1 changed files with 356 additions and 356 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Source/OpenTK/Platform/X11/X11GLNative.cs
View file

@ -673,7 +673,7 @@ namespace OpenTK.Platform.X11
} }
if (minimized) if (minimized)
return WindowState.Minimized; return OpenTK.WindowState.Minimized;
else if (maximized == 2) else if (maximized == 2)
return OpenTK.WindowState.Maximized; return OpenTK.WindowState.Maximized;
else if (fullscreen) else if (fullscreen)
@ -733,13 +733,13 @@ namespace OpenTK.Platform.X11
break; break;
case WindowState.Minimized: case OpenTK.WindowState.Minimized:
// FIXME multiscreen support // FIXME multiscreen support
Functions.XIconifyWindow(window.Display, window.WindowHandle, window.Screen); Functions.XIconifyWindow(window.Display, window.WindowHandle, window.Screen);
break; break;
case WindowState.Fullscreen: case OpenTK.WindowState.Fullscreen:
//_previous_window_border = this.WindowBorder; //_previous_window_border = this.WindowBorder;
//this.WindowBorder = WindowBorder.Hidden; //this.WindowBorder = WindowBorder.Hidden;
Functions.SendNetWMMessage(window, _atom_net_wm_state, _atom_add, Functions.SendNetWMMessage(window, _atom_net_wm_state, _atom_add,