summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRay <[email protected]>2019-01-10 17:06:26 +0100
committerRay <[email protected]>2019-01-10 17:06:26 +0100
commit7132ba44db85aaa4787509cb94cb859fd3009c81 (patch)
tree1806bf49b8131297d26ff9697d2725762c0a4be2
parent91ea00747838b38b0db4808ea43124d50d316a1e (diff)
downloadraylib-7132ba44db85aaa4787509cb94cb859fd3009c81.tar.gz
raylib-7132ba44db85aaa4787509cb94cb859fd3009c81.zip
Reviewed latest PR
-rw-r--r--src/core.c26
-rw-r--r--src/raylib.h10
2 files changed, 18 insertions, 18 deletions
diff --git a/src/core.c b/src/core.c
index c84610ba..9b6a7ce0 100644
--- a/src/core.c
+++ b/src/core.c
@@ -739,6 +739,15 @@ bool IsWindowMinimized(void)
#endif
}
+// Check if window is currently hidden
+bool IsWindowHidden(void)
+{
+#if defined(PLATFORM_DESKTOP)
+ return (glfwGetWindowAttrib(window, GLFW_VISIBLE) == GL_FALSE);
+#endif
+ return false;
+}
+
// Toggle fullscreen mode (only PLATFORM_DESKTOP)
void ToggleFullscreen(void)
{
@@ -827,7 +836,7 @@ void SetWindowSize(int width, int height)
}
// Show the window
-void ShowWindow()
+void ShowWindow(void)
{
#if defined(PLATFORM_DESKTOP)
glfwShowWindow(window);
@@ -835,22 +844,13 @@ void ShowWindow()
}
// Hide the window
-void HideWindow()
+void HideWindow(void)
{
#if defined(PLATFORM_DESKTOP)
glfwHideWindow(window);
#endif
}
-// Check if window is currently hidden
-bool IsWindowHidden()
-{
-#if defined(PLATFORM_DESKTOP)
- return glfwGetWindowAttrib(window, GLFW_VISIBLE) == GL_FALSE;
-#endif
- return false;
-}
-
// Get current screen width
int GetScreenWidth(void)
{
@@ -2282,13 +2282,13 @@ static bool InitGraphicsDevice(int width, int height)
//glfwWindowHint(GLFW_AUX_BUFFERS, 0); // Number of auxiliar buffers
// Check some Window creation flags
- if (configFlags & FLAG_WINDOW_HIDDEN) glfwWindowHint(GLFW_VISIBLE, GL_FALSE); // Visible window
+ if (configFlags & FLAG_WINDOW_HIDDEN) glfwWindowHint(GLFW_VISIBLE, GL_FALSE); // Visible window
else glfwWindowHint(GLFW_VISIBLE, GL_TRUE); // Window initially hidden
if (configFlags & FLAG_WINDOW_RESIZABLE) glfwWindowHint(GLFW_RESIZABLE, GL_TRUE); // Resizable window
else glfwWindowHint(GLFW_RESIZABLE, GL_FALSE); // Avoid window being resizable
- if (configFlags & FLAG_WINDOW_UNDECORATED) glfwWindowHint(GLFW_DECORATED, GLFW_FALSE); // Border and buttons on Window
+ if (configFlags & FLAG_WINDOW_UNDECORATED) glfwWindowHint(GLFW_DECORATED, GLFW_FALSE); // Border and buttons on Window
else glfwWindowHint(GLFW_DECORATED, GLFW_TRUE); // Decorated window
// FLAG_WINDOW_TRANSPARENT not supported on HTML5 and not included in any released GLFW version yet
#if defined(GLFW_TRANSPARENT_FRAMEBUFFER)
diff --git a/src/raylib.h b/src/raylib.h
index b554d10d..c089b4c0 100644
--- a/src/raylib.h
+++ b/src/raylib.h
@@ -834,23 +834,23 @@ extern "C" { // Prevents name mangling of functions
// Window-related functions
RLAPI void InitWindow(int width, int height, const char *title); // Initialize window and OpenGL context
+RLAPI bool WindowShouldClose(void); // Check if KEY_ESCAPE pressed or Close icon pressed
RLAPI void CloseWindow(void); // Close window and unload OpenGL context
RLAPI bool IsWindowReady(void); // Check if window has been initialized successfully
-RLAPI bool WindowShouldClose(void); // Check if KEY_ESCAPE pressed or Close icon pressed
RLAPI bool IsWindowMinimized(void); // Check if window has been minimized (or lost focus)
+RLAPI bool IsWindowHidden(void); // Check if window is currently hidden
RLAPI void ToggleFullscreen(void); // Toggle fullscreen mode (only PLATFORM_DESKTOP)
+RLAPI void ShowWindow(void); // Show the window
+RLAPI void HideWindow(void); // Hide the window
RLAPI void SetWindowIcon(Image image); // Set icon for window (only PLATFORM_DESKTOP)
RLAPI void SetWindowTitle(const char *title); // Set title for window (only PLATFORM_DESKTOP)
RLAPI void SetWindowPosition(int x, int y); // Set window position on screen (only PLATFORM_DESKTOP)
RLAPI void SetWindowMonitor(int monitor); // Set monitor for the current window (fullscreen mode)
RLAPI void SetWindowMinSize(int width, int height); // Set window minimum dimensions (for FLAG_WINDOW_RESIZABLE)
RLAPI void SetWindowSize(int width, int height); // Set window dimensions
-RLAPI void ShowWindow(); // Show the window
-RLAPI void HideWindow(); // Hide the window
-RLAPI bool IsWindowHidden(); // Check if window is currently hidden
+RLAPI void *GetWindowHandle(void); // Get native window handle
RLAPI int GetScreenWidth(void); // Get current screen width
RLAPI int GetScreenHeight(void); // Get current screen height
-RLAPI void *GetWindowHandle(void); // Get native window handle
RLAPI int GetMonitorCount(void); // Get number of connected monitors
RLAPI int GetMonitorWidth(int monitor); // Get primary monitor width
RLAPI int GetMonitorHeight(int monitor); // Get primary monitor height