mirror of
https://github.com/glfw/glfw.git
synced 2024-11-10 00:51:47 +00:00
parent
e9c7314d50
commit
5ca875a7ff
@ -95,6 +95,8 @@ GLFW bundles a number of dependencies in the `deps/` directory.
|
|||||||
of their physical location
|
of their physical location
|
||||||
- [Win32] Bugfix: Maximized hidden windows were restored by `glfwShowWindow`
|
- [Win32] Bugfix: Maximized hidden windows were restored by `glfwShowWindow`
|
||||||
- [Win32] Bugfix: Context re-creation was not triggered by sRGB hint
|
- [Win32] Bugfix: Context re-creation was not triggered by sRGB hint
|
||||||
|
- [Win32] Bugfix: Full screen windows were incorrectly sized and placed on some
|
||||||
|
systems
|
||||||
- [X11] Added run-time support for systems lacking the XKB extension
|
- [X11] Added run-time support for systems lacking the XKB extension
|
||||||
- [X11] Made GLX 1.3 the minimum supported version
|
- [X11] Made GLX 1.3 the minimum supported version
|
||||||
- [X11] Replaced `XRRGetScreenResources` with `XRRGetScreenResourcesCurrent`
|
- [X11] Replaced `XRRGetScreenResources` with `XRRGetScreenResourcesCurrent`
|
||||||
|
@ -390,6 +390,32 @@ static int translateKey(WPARAM wParam, LPARAM lParam)
|
|||||||
return GLFW_KEY_UNKNOWN;
|
return GLFW_KEY_UNKNOWN;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Enter fullscreen mode
|
||||||
|
//
|
||||||
|
static GLboolean enterFullscreenMode(_GLFWwindow* window)
|
||||||
|
{
|
||||||
|
GLFWvidmode mode;
|
||||||
|
GLboolean status;
|
||||||
|
int xpos, ypos;
|
||||||
|
|
||||||
|
status = _glfwSetVideoMode(window->monitor, &window->videoMode);
|
||||||
|
|
||||||
|
_glfwPlatformGetVideoMode(window->monitor, &mode);
|
||||||
|
_glfwPlatformGetMonitorPos(window->monitor, &xpos, &ypos);
|
||||||
|
|
||||||
|
SetWindowPos(window->win32.handle, HWND_TOPMOST,
|
||||||
|
xpos, ypos, mode.width, mode.height, SWP_NOCOPYBITS);
|
||||||
|
|
||||||
|
return status;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Leave fullscreen mode
|
||||||
|
//
|
||||||
|
static void leaveFullscreenMode(_GLFWwindow* window)
|
||||||
|
{
|
||||||
|
_glfwRestoreVideoMode(window->monitor);
|
||||||
|
}
|
||||||
|
|
||||||
// Window callback function (handles window events)
|
// Window callback function (handles window events)
|
||||||
//
|
//
|
||||||
static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg,
|
static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg,
|
||||||
@ -448,7 +474,7 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg,
|
|||||||
_glfwPlatformIconifyWindow(window);
|
_glfwPlatformIconifyWindow(window);
|
||||||
}
|
}
|
||||||
|
|
||||||
_glfwRestoreVideoMode(window->monitor);
|
leaveFullscreenMode(window);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (focused && _glfw.focusedWindow != window)
|
else if (focused && _glfw.focusedWindow != window)
|
||||||
@ -459,7 +485,7 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg,
|
|||||||
_glfwPlatformApplyCursorMode(window);
|
_glfwPlatformApplyCursorMode(window);
|
||||||
|
|
||||||
if (window->monitor && window->autoIconify)
|
if (window->monitor && window->autoIconify)
|
||||||
_glfwSetVideoMode(window->monitor, &window->videoMode);
|
enterFullscreenMode(window);
|
||||||
}
|
}
|
||||||
|
|
||||||
_glfwInputWindowFocus(window, focused);
|
_glfwInputWindowFocus(window, focused);
|
||||||
@ -858,6 +884,9 @@ static int createWindow(_GLFWwindow* window,
|
|||||||
{
|
{
|
||||||
window->win32.dwStyle |= WS_POPUP;
|
window->win32.dwStyle |= WS_POPUP;
|
||||||
|
|
||||||
|
// NOTE: This window placement is temporary and approximate, as the
|
||||||
|
// correct position and size cannot be known until the monitor
|
||||||
|
// video mode has been set
|
||||||
_glfwPlatformGetMonitorPos(wndconfig->monitor, &xpos, &ypos);
|
_glfwPlatformGetMonitorPos(wndconfig->monitor, &xpos, &ypos);
|
||||||
fullWidth = wndconfig->width;
|
fullWidth = wndconfig->width;
|
||||||
fullHeight = wndconfig->height;
|
fullHeight = wndconfig->height;
|
||||||
@ -1050,13 +1079,9 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window,
|
|||||||
|
|
||||||
if (window->monitor)
|
if (window->monitor)
|
||||||
{
|
{
|
||||||
if (!_glfwSetVideoMode(window->monitor, &window->videoMode))
|
|
||||||
return GL_FALSE;
|
|
||||||
|
|
||||||
// Place the window above all topmost windows
|
|
||||||
_glfwPlatformShowWindow(window);
|
_glfwPlatformShowWindow(window);
|
||||||
SetWindowPos(window->win32.handle, HWND_TOPMOST, 0,0,0,0,
|
if (!enterFullscreenMode(window))
|
||||||
SWP_NOMOVE | SWP_NOSIZE);
|
return GL_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
return GL_TRUE;
|
return GL_TRUE;
|
||||||
@ -1064,10 +1089,10 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window,
|
|||||||
|
|
||||||
void _glfwPlatformDestroyWindow(_GLFWwindow* window)
|
void _glfwPlatformDestroyWindow(_GLFWwindow* window)
|
||||||
{
|
{
|
||||||
destroyWindow(window);
|
|
||||||
|
|
||||||
if (window->monitor)
|
if (window->monitor)
|
||||||
_glfwRestoreVideoMode(window->monitor);
|
leaveFullscreenMode(window);
|
||||||
|
|
||||||
|
destroyWindow(window);
|
||||||
}
|
}
|
||||||
|
|
||||||
void _glfwPlatformSetWindowTitle(_GLFWwindow* window, const char* title)
|
void _glfwPlatformSetWindowTitle(_GLFWwindow* window, const char* title)
|
||||||
@ -1118,15 +1143,7 @@ void _glfwPlatformGetWindowSize(_GLFWwindow* window, int* width, int* height)
|
|||||||
void _glfwPlatformSetWindowSize(_GLFWwindow* window, int width, int height)
|
void _glfwPlatformSetWindowSize(_GLFWwindow* window, int width, int height)
|
||||||
{
|
{
|
||||||
if (window->monitor)
|
if (window->monitor)
|
||||||
{
|
enterFullscreenMode(window);
|
||||||
GLFWvidmode mode;
|
|
||||||
_glfwSetVideoMode(window->monitor, &window->videoMode);
|
|
||||||
_glfwPlatformGetVideoMode(window->monitor, &mode);
|
|
||||||
|
|
||||||
SetWindowPos(window->win32.handle, HWND_TOP,
|
|
||||||
0, 0, mode.width, mode.height,
|
|
||||||
SWP_NOMOVE);
|
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
int fullWidth, fullHeight;
|
int fullWidth, fullHeight;
|
||||||
|
Loading…
Reference in New Issue
Block a user