organicmaps/glfw
13
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-04-05 05:25:07 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Merge f1284eb884 into e7ea71be03

Browse source
This commit is contained in:
halx99 2025-01-19 07:30:04 +00:00 • committed by GitHub
commit 2dfa98bb94
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 38 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
include/GLFW/glfw3.h
View file

@ -1129,6 +1129,7 @@ extern "C" {
/*! @brief Win32 specific [window hint](@ref GLFW_WIN32_SHOWDEFAULT_hint).
*/
#define GLFW_WIN32_SHOWDEFAULT 0x00025002
#define GLFW_WIN32_HWND_PARENT 0x00025003
/*! @brief Wayland specific
* [window hint](@ref GLFW_WAYLAND_APP_ID_hint).
*
@ -3053,6 +3054,14 @@ GLFWAPI void glfwDefaultWindowHints(void);
*/
GLFWAPI void glfwWindowHint(int hint, int value);
/*! @brief Sets the specified window hint to the desired value.
*
* @since Added in version 3.4.x.
*
* @ingroup window
*/
GLFWAPI void glfwWindowHintPointer(int hint, void* value);
/*! @brief Sets the specified window hint to the desired value.
*
* This function sets hints for the next call to @ref glfwCreateWindow. The

1
src/internal.h
View file

@ -425,6 +425,7 @@ struct _GLFWwndconfig
struct {
GLFWbool keymenu;
GLFWbool showDefault;
void* handleParent;
} win32;
struct {
char appId[256];

1
src/win32_platform.h
View file

@ -413,6 +413,7 @@ typedef struct _GLFWlibraryWGL
typedef struct _GLFWwindowWin32
{
HWND handle;
HWND handleParent;
HICON bigIcon;
HICON smallIcon;

23
src/win32_window.c
View file

@ -46,17 +46,22 @@ static DWORD getWindowStyle(const _GLFWwindow* window)
style |= WS_POPUP;
else
{
style |= WS_SYSMENU | WS_MINIMIZEBOX;
if (window->decorated)
if (!window->win32.handleParent)
{
style |= WS_CAPTION;
style |= WS_SYSMENU | WS_MINIMIZEBOX;
if (window->resizable)
style |= WS_MAXIMIZEBOX | WS_THICKFRAME;
if (window->decorated)
{
style |= WS_CAPTION;
if (window->resizable)
style |= WS_MAXIMIZEBOX | WS_THICKFRAME;
}
else
style |= WS_POPUP;
}
else
style |= WS_POPUP;
style |= WS_CHILD;
}
return style;
@ -1391,7 +1396,7 @@ static int createNativeWindow(_GLFWwindow* window,
style,
frameX, frameY,
frameWidth, frameHeight,
NULL, // No parent window
(HWND)wndconfig->win32.handleParent,
NULL, // No window menu
_glfw.win32.instance,
(LPVOID) wndconfig);
@ -1497,6 +1502,8 @@ GLFWbool _glfwCreateWindowWin32(_GLFWwindow* window,
const _GLFWctxconfig* ctxconfig,
const _GLFWfbconfig* fbconfig)
{
window->win32.handleParent = wndconfig->win32.handleParent;
if (!createNativeWindow(window, wndconfig, fbconfig))
return GLFW_FALSE;

12
src/window.c
View file

@ -436,6 +436,18 @@ GLFWAPI void glfwWindowHint(int hint, int value)
_glfwInputError(GLFW_INVALID_ENUM, "Invalid window hint 0x%08X", hint);
}
GLFWAPI void glfwWindowHintPointer(int hint, void* value)
{
_GLFW_REQUIRE_INIT();
switch (hint)
{
case GLFW_WIN32_HWND_PARENT:
_glfw.hints.window.win32.handleParent = value;
break;
}
}
GLFWAPI void glfwWindowHintString(int hint, const char* value)
{
assert(value != NULL);