Jiga228/glfw
0
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2026-09-18 22:55:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Formatting.

Browse Source
This commit is contained in:
Camilla Berglund
2011-02-09 12:57:11 +01:00
parent 508e76e53d
commit e0ba9e4e1f
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/input.c
+5 -5
View File
@@ -159,7 +159,7 @@ GLFWAPI void glfwSetMousePos(GLFWwindow handle, int xpos, int ypos)
// Returns the scroll offset for the specified window
//========================================================================
GLFWAPI void glfwGetScrollOffset(GLFWwindow handle, int* x, int* y)
GLFWAPI void glfwGetScrollOffset(GLFWwindow handle, int* xoffset, int* yoffset)
{
if (!_glfwInitialized)
{
@@ -169,11 +169,11 @@ GLFWAPI void glfwGetScrollOffset(GLFWwindow handle, int* x, int* y)
_GLFWwindow* window = (_GLFWwindow*) handle;
if (x)
*x = window->scrollX;
if (xoffset)
*xoffset = window->scrollX;
if (y)
*y = window->scrollY;
if (yoffset)
*yoffset = window->scrollY;
}
src/window.c
+11 -11
View File
@@ -186,13 +186,13 @@ void _glfwInputChar(_GLFWwindow* window, int character)
// Register scroll events
//========================================================================
void _glfwInputScroll(_GLFWwindow* window, int x, int y)
void _glfwInputScroll(_GLFWwindow* window, int xoffset, int yoffset)
{
window->scrollX += x;
window->scrollY += y;
window->scrollX += xoffset;
window->scrollY += yoffset;
if (_glfwLibrary.scrollCallback)
_glfwLibrary.scrollCallback(window, x, y);
_glfwLibrary.scrollCallback(window, xoffset, yoffset);
}
@@ -896,7 +896,7 @@ GLFWAPI void glfwSetWindowSize(GLFWwindow handle, int width, int height)
// Get the window position
//========================================================================
GLFWAPI void glfwGetWindowPos(GLFWwindow handle, int* x, int* y)
GLFWAPI void glfwGetWindowPos(GLFWwindow handle, int* xpos, int* ypos)
{
if (!_glfwInitialized)
{
@@ -906,11 +906,11 @@ GLFWAPI void glfwGetWindowPos(GLFWwindow handle, int* x, int* y)
_GLFWwindow* window = (_GLFWwindow*) handle;
if (x != NULL)
*x = window->positionX;
if (xpos != NULL)
*xpos = window->positionX;
if (y != NULL)
*y = window->positionY;
if (ypos != NULL)
*ypos = window->positionY;
}
@@ -918,7 +918,7 @@ GLFWAPI void glfwGetWindowPos(GLFWwindow handle, int* x, int* y)
// Set the window position
//========================================================================
GLFWAPI void glfwSetWindowPos(GLFWwindow handle, int x, int y)
GLFWAPI void glfwSetWindowPos(GLFWwindow handle, int xpos, int ypos)
{
if (!_glfwInitialized)
{
@@ -934,7 +934,7 @@ GLFWAPI void glfwSetWindowPos(GLFWwindow handle, int x, int y)
return;
}
_glfwPlatformSetWindowPos(window, x, y);
_glfwPlatformSetWindowPos(window, xpos, ypos);
}