mirror of
https://github.com/glfw/glfw.git
synced 2025-08-31 19:11:49 +00:00
Merge 305fcbbf94
into 63a7e8b7f8
This commit is contained in:
commit
ee45edf818
@ -649,12 +649,12 @@ static void acquireMonitor(_GLFWwindow* window)
|
|||||||
if (window->wl.libdecor.frame)
|
if (window->wl.libdecor.frame)
|
||||||
{
|
{
|
||||||
libdecor_frame_set_fullscreen(window->wl.libdecor.frame,
|
libdecor_frame_set_fullscreen(window->wl.libdecor.frame,
|
||||||
window->monitor->wl.output);
|
NULL);
|
||||||
}
|
}
|
||||||
else if (window->wl.xdg.toplevel)
|
else if (window->wl.xdg.toplevel)
|
||||||
{
|
{
|
||||||
xdg_toplevel_set_fullscreen(window->wl.xdg.toplevel,
|
xdg_toplevel_set_fullscreen(window->wl.xdg.toplevel,
|
||||||
window->monitor->wl.output);
|
NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
setIdleInhibitor(window, GLFW_TRUE);
|
setIdleInhibitor(window, GLFW_TRUE);
|
||||||
@ -995,7 +995,7 @@ static GLFWbool createLibdecorFrame(_GLFWwindow* window)
|
|||||||
if (window->monitor)
|
if (window->monitor)
|
||||||
{
|
{
|
||||||
libdecor_frame_set_fullscreen(window->wl.libdecor.frame,
|
libdecor_frame_set_fullscreen(window->wl.libdecor.frame,
|
||||||
window->monitor->wl.output);
|
NULL);
|
||||||
setIdleInhibitor(window, GLFW_TRUE);
|
setIdleInhibitor(window, GLFW_TRUE);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -1088,7 +1088,7 @@ static GLFWbool createXdgShellObjects(_GLFWwindow* window)
|
|||||||
|
|
||||||
if (window->monitor)
|
if (window->monitor)
|
||||||
{
|
{
|
||||||
xdg_toplevel_set_fullscreen(window->wl.xdg.toplevel, window->monitor->wl.output);
|
xdg_toplevel_set_fullscreen(window->wl.xdg.toplevel, NULL);
|
||||||
setIdleInhibitor(window, GLFW_TRUE);
|
setIdleInhibitor(window, GLFW_TRUE);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
Loading…
Reference in New Issue
Block a user