mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-22 21:14:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

X11: Fix parent window handle initialization

Browse Source 
This should have been initialized to the screen root, not None.  This
issue was introduced by fe57e3c292.

Fixes #1620.

(cherry picked from commit 9372ba95fa)
This commit is contained in:
Camilla Löwy 2020-01-12 17:18:21 +01:00
parent 487e0419a7
commit fbe8ae993c
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/x11_window.c
View File

@ -622,6 +622,7 @@ static GLFWbool createNativeWindow(_GLFWwindow* window,
_glfwGrabErrorHandlerX11(); _glfwGrabErrorHandlerX11();
window->x11.parent = _glfw.x11.root;
window->x11.handle = XCreateWindow(_glfw.x11.display, window->x11.handle = XCreateWindow(_glfw.x11.display,
_glfw.x11.root, _glfw.x11.root,
0, 0, // Position 0, 0, // Position
@ -1258,12 +1259,6 @@ static void processEvent(XEvent *event)
switch (event->type) switch (event->type)
{ {
case CreateNotify:
{
window->x11.parent = event->xcreatewindow.parent;
return;
}
case ReparentNotify: case ReparentNotify:
{ {
window->x11.parent = event->xreparent.parent; window->x11.parent = event->xreparent.parent;