Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-10-02 12:51:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Window Resize Not Accounting For Window Decoration

Browse Source
This commit is contained in:
TheBrokenRail 2022-06-10 00:53:30 -04:00
parent d3ede7b684
commit b2fbfc48b1
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/wl_window.c
View File

@ -1842,6 +1842,15 @@ void _glfwGetWindowSizeWayland(_GLFWwindow* window, int* width, int* height)
void _glfwSetWindowSizeWayland(_GLFWwindow* window, int width, int height) void _glfwSetWindowSizeWayland(_GLFWwindow* window, int width, int height)
{ {
if (window->decorated && !window->monitor && !window->wl.decorations.serverSide)
{
width -= _GLFW_DECORATION_HORIZONTAL;
height -= _GLFW_DECORATION_VERTICAL;
}
if (width <= 0 || height <= 0)
{
return;
}
window->wl.width = width; window->wl.width = width;
window->wl.height = height; window->wl.height = height;
resizeWindow(window); resizeWindow(window);
@ -1857,6 +1866,13 @@ void _glfwSetWindowSizeLimitsWayland(_GLFWwindow* window,
minwidth = minheight = 0; minwidth = minheight = 0;
if (maxwidth == GLFW_DONT_CARE || maxheight == GLFW_DONT_CARE) if (maxwidth == GLFW_DONT_CARE || maxheight == GLFW_DONT_CARE)
maxwidth = maxheight = 0; maxwidth = maxheight = 0;
if (window->decorated && !window->monitor && !window->wl.decorations.serverSide)
{
minwidth += _GLFW_DECORATION_HORIZONTAL;
minheight += _GLFW_DECORATION_VERTICAL;
maxwidth += _GLFW_DECORATION_HORIZONTAL;
maxheight += _GLFW_DECORATION_VERTICAL;
}
xdg_toplevel_set_min_size(window->wl.xdg.toplevel, minwidth, minheight); xdg_toplevel_set_min_size(window->wl.xdg.toplevel, minwidth, minheight);
xdg_toplevel_set_max_size(window->wl.xdg.toplevel, maxwidth, maxheight); xdg_toplevel_set_max_size(window->wl.xdg.toplevel, maxwidth, maxheight);
wl_surface_commit(window->wl.surface); wl_surface_commit(window->wl.surface);