This commit is contained in:
Camilla Löwy 2017-10-26 18:05:56 +02:00
parent 16bf872117
commit bf09dba95b
6 changed files with 6 additions and 6 deletions

View File

@ -1375,7 +1375,7 @@ void _glfwPlatformSetWindowMonitor(_GLFWwindow* window,
if (window->monitor) if (window->monitor)
releaseMonitor(window); releaseMonitor(window);
_glfwInputWindowMonitorChange(window, monitor); _glfwInputWindowMonitor(window, monitor);
// HACK: Allow the state cached in Cocoa to catch up to reality // HACK: Allow the state cached in Cocoa to catch up to reality
// TODO: Solve this in a less terrible way // TODO: Solve this in a less terrible way

View File

@ -779,7 +779,7 @@ void _glfwInputWindowCloseRequest(_GLFWwindow* window);
* @param[in] monitor The new desired monitor, or `NULL`. * @param[in] monitor The new desired monitor, or `NULL`.
* @ingroup event * @ingroup event
*/ */
void _glfwInputWindowMonitorChange(_GLFWwindow* window, _GLFWmonitor* monitor); void _glfwInputWindowMonitor(_GLFWwindow* window, _GLFWmonitor* monitor);
/*! @brief Notifies shared code of a physical key event. /*! @brief Notifies shared code of a physical key event.
* @param[in] window The window that received the event. * @param[in] window The window that received the event.

View File

@ -1477,7 +1477,7 @@ void _glfwPlatformSetWindowMonitor(_GLFWwindow* window,
if (window->monitor) if (window->monitor)
releaseMonitor(window); releaseMonitor(window);
_glfwInputWindowMonitorChange(window, monitor); _glfwInputWindowMonitor(window, monitor);
if (monitor) if (monitor)
{ {

View File

@ -108,7 +108,7 @@ void _glfwInputWindowCloseRequest(_GLFWwindow* window)
window->callbacks.close((GLFWwindow*) window); window->callbacks.close((GLFWwindow*) window);
} }
void _glfwInputWindowMonitorChange(_GLFWwindow* window, _GLFWmonitor* monitor) void _glfwInputWindowMonitor(_GLFWwindow* window, _GLFWmonitor* monitor)
{ {
window->monitor = monitor; window->monitor = monitor;
} }

View File

@ -642,7 +642,7 @@ void _glfwPlatformSetWindowMonitor(_GLFWwindow* window,
{ {
wl_shell_surface_set_toplevel(window->wl.shellSurface); wl_shell_surface_set_toplevel(window->wl.shellSurface);
} }
_glfwInputWindowMonitorChange(window, monitor); _glfwInputWindowMonitor(window, monitor);
} }
int _glfwPlatformWindowFocused(_GLFWwindow* window) int _glfwPlatformWindowFocused(_GLFWwindow* window)

View File

@ -2377,7 +2377,7 @@ void _glfwPlatformSetWindowMonitor(_GLFWwindow* window,
if (window->monitor) if (window->monitor)
releaseMonitor(window); releaseMonitor(window);
_glfwInputWindowMonitorChange(window, monitor); _glfwInputWindowMonitor(window, monitor);
updateNormalHints(window, width, height); updateNormalHints(window, width, height);
updateWindowMode(window); updateWindowMode(window);