Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-10-04 13:46:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed code formatting and changelog as per PR review.

Browse Source
This commit is contained in:
Doug Binks 2018-05-29 14:10:25 +01:00
parent 2bb18b59e9
commit d5b9732175
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -124,8 +124,6 @@ information on what to include when reporting a bug.
## Changelog ## Changelog
- Added `GLFW_FOCUS_ON_SHOW` window hint and attribute to control input focus
on calling show window (#1189)
- Added `glfwGetError` function for querying the last error code and its - Added `glfwGetError` function for querying the last error code and its
description (#970) description (#970)
- Added `glfwUpdateGamepadMappings` function for importing gamepad mappings in - Added `glfwUpdateGamepadMappings` function for importing gamepad mappings in
@ -167,6 +165,8 @@ information on what to include when reporting a bug.
- Added `GLFW_HOVERED` window attribute for polling cursor hover state (#1166) - Added `GLFW_HOVERED` window attribute for polling cursor hover state (#1166)
- Added `GLFW_CENTER_CURSOR` window hint for controlling cursor centering - Added `GLFW_CENTER_CURSOR` window hint for controlling cursor centering
(#749,#842) (#749,#842)
- Added `GLFW_FOCUS_ON_SHOW` window hint and attribute to control input focus
on calling show window (#1189)
- Added `GLFW_JOYSTICK_HAT_BUTTONS` init hint (#889) - Added `GLFW_JOYSTICK_HAT_BUTTONS` init hint (#889)
- Added `GLFW_LOCK_KEY_MODS` input mode and `GLFW_MOD_*_LOCK` mod bits (#946) - Added `GLFW_LOCK_KEY_MODS` input mode and `GLFW_MOD_*_LOCK` mod bits (#946)
- Added macOS specific `GLFW_COCOA_RETINA_FRAMEBUFFER` window hint - Added macOS specific `GLFW_COCOA_RETINA_FRAMEBUFFER` window hint

2
src/window.c
View File

@ -761,7 +761,7 @@ GLFWAPI void glfwShowWindow(GLFWwindow* handle)
_glfwPlatformShowWindow(window); _glfwPlatformShowWindow(window);
if(window->focusOnShow) if (window->focusOnShow)
_glfwPlatformFocusWindow(window); _glfwPlatformFocusWindow(window);
} }

2
tests/windows.c
View File

@ -127,7 +127,7 @@ int main(int argc, char** argv)
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
{ {
int left, top, right, bottom; int left, top, right, bottom;
if(i) if (i)
glfwWindowHint(GLFW_FOCUS_ON_SHOW, focusOnShow); glfwWindowHint(GLFW_FOCUS_ON_SHOW, focusOnShow);
windows[i] = glfwCreateWindow(200, 200, titles[i], NULL, NULL); windows[i] = glfwCreateWindow(200, 200, titles[i], NULL, NULL);