|
@@ -646,10 +646,10 @@ GLFWAPI void glfwIconifyWindow(GLFWwindow handle)
|
|
|
|
|
|
|
|
|
|
//========================================================================
|
|
//========================================================================
|
|
-// Window show
|
|
|
|
|
|
+// Window un-iconification
|
|
//========================================================================
|
|
//========================================================================
|
|
|
|
|
|
-GLFWAPI void glfwShowWindow(GLFWwindow handle)
|
|
|
|
|
|
+GLFWAPI void glfwRestoreWindow(GLFWwindow handle)
|
|
{
|
|
{
|
|
_GLFWwindow* window = (_GLFWwindow*) handle;
|
|
_GLFWwindow* window = (_GLFWwindow*) handle;
|
|
|
|
|
|
@@ -659,18 +659,21 @@ GLFWAPI void glfwShowWindow(GLFWwindow handle)
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
|
|
- if (window->mode == GLFW_FULLSCREEN)
|
|
|
|
|
|
+ if (!window->iconified)
|
|
return;
|
|
return;
|
|
|
|
|
|
- _glfwPlatformShowWindow(window);
|
|
|
|
|
|
+ _glfwPlatformRestoreWindow(window);
|
|
|
|
+
|
|
|
|
+ if (window->mode == GLFW_FULLSCREEN)
|
|
|
|
+ _glfwPlatformRefreshWindowParams(window);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
//========================================================================
|
|
//========================================================================
|
|
-// Window hide
|
|
|
|
|
|
+// Window show
|
|
//========================================================================
|
|
//========================================================================
|
|
|
|
|
|
-GLFWAPI void glfwHideWindow(GLFWwindow handle)
|
|
|
|
|
|
+GLFWAPI void glfwShowWindow(GLFWwindow handle)
|
|
{
|
|
{
|
|
_GLFWwindow* window = (_GLFWwindow*) handle;
|
|
_GLFWwindow* window = (_GLFWwindow*) handle;
|
|
|
|
|
|
@@ -683,15 +686,15 @@ GLFWAPI void glfwHideWindow(GLFWwindow handle)
|
|
if (window->mode == GLFW_FULLSCREEN)
|
|
if (window->mode == GLFW_FULLSCREEN)
|
|
return;
|
|
return;
|
|
|
|
|
|
- _glfwPlatformHideWindow(window);
|
|
|
|
|
|
+ _glfwPlatformShowWindow(window);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
//========================================================================
|
|
//========================================================================
|
|
-// Window un-iconification
|
|
|
|
|
|
+// Window hide
|
|
//========================================================================
|
|
//========================================================================
|
|
|
|
|
|
-GLFWAPI void glfwRestoreWindow(GLFWwindow handle)
|
|
|
|
|
|
+GLFWAPI void glfwHideWindow(GLFWwindow handle)
|
|
{
|
|
{
|
|
_GLFWwindow* window = (_GLFWwindow*) handle;
|
|
_GLFWwindow* window = (_GLFWwindow*) handle;
|
|
|
|
|
|
@@ -701,13 +704,10 @@ GLFWAPI void glfwRestoreWindow(GLFWwindow handle)
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
|
|
- if (!window->iconified)
|
|
|
|
|
|
+ if (window->mode == GLFW_FULLSCREEN)
|
|
return;
|
|
return;
|
|
|
|
|
|
- _glfwPlatformRestoreWindow(window);
|
|
|
|
-
|
|
|
|
- if (window->mode == GLFW_FULLSCREEN)
|
|
|
|
- _glfwPlatformRefreshWindowParams(window);
|
|
|
|
|
|
+ _glfwPlatformHideWindow(window);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|