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

Merge pull request #261 from Frassle/resize

Browse source 
X11: Fix so ClientSize can resize windows with fixed borders
This commit is contained in:
Fraser Waters 2015-05-29 10:40:35 +01:00
commit e6e8b7a357
2 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Source/OpenTK/Platform/NativeWindowBase.cs
View file

@ -417,8 +417,7 @@ namespace OpenTK.Platform
}
set
{
Rectangle old = ClientRectangle;
ClientRectangle = new Rectangle(old.X, old.Y, value, old.Height);
ClientSize = new Size(value, ClientSize.Height);
}
}
@ -430,8 +429,7 @@ namespace OpenTK.Platform
}
set
{
Rectangle old = ClientRectangle;
Bounds = new Rectangle(old.X, old.Y, old.Width, value);
ClientSize = new Size(ClientSize.Width, value);
}
}

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

@ -1072,11 +1072,25 @@ namespace OpenTK.Platform.X11
}
set
{
bool is_size_changed = client_rectangle.Size != value;
int width = value.Width;
int height = value.Height;
if (WindowBorder != WindowBorder.Resizable)
{
SetWindowMinMax(width, height, width, height);
}
using (new XLock(window.Display))
{
Functions.XResizeWindow(window.Display, window.Handle,
value.Width, value.Height);
if (is_size_changed)
{
Functions.XResizeWindow(window.Display, window.Handle,
width, height);
}
}
ProcessEvents();
}
}