Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-25 11:35:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add minor features and updates to window test

Browse Source 
- Button label reflects window mode
- Window attention request button
- Slightly less bad button layout possibly
- Applicable button labels list expected delay
- Less telegraphic message for positions being unsupported
- Window size more likely to fit contents
This commit is contained in:
Camilla Löwy 2024-02-09 13:06:26 +01:00
parent 00e86d4b73
commit eeb403135d
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tests/window.c
View File

@ -71,7 +71,7 @@ int main(int argc, char** argv)
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 2); glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 2);
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 1); glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 1);
GLFWwindow* window = glfwCreateWindow(600, 600, "Window Features", NULL, NULL); GLFWwindow* window = glfwCreateWindow(600, 630, "Window Features", NULL, NULL);
if (!window) if (!window)
{ {
glfwTerminate(); glfwTerminate();
@ -121,17 +121,20 @@ int main(int argc, char** argv)
nk_glfw3_new_frame(); nk_glfw3_new_frame();
if (nk_begin(nk, "main", area, 0)) if (nk_begin(nk, "main", area, 0))
{ {
nk_layout_row_dynamic(nk, 30, 5); nk_layout_row_dynamic(nk, 30, 4);
if (nk_button_label(nk, "Toggle Fullscreen")) if (glfwGetWindowMonitor(window))
{ {
if (glfwGetWindowMonitor(window)) if (nk_button_label(nk, "Make Windowed"))
{ {
glfwSetWindowMonitor(window, NULL, glfwSetWindowMonitor(window, NULL,
windowed_x, windowed_y, windowed_x, windowed_y,
windowed_width, windowed_height, 0); windowed_width, windowed_height, 0);
} }
else }
else
{
if (nk_button_label(nk, "Make Fullscreen"))
{ {
GLFWmonitor* monitor = glfwGetPrimaryMonitor(); GLFWmonitor* monitor = glfwGetPrimaryMonitor();
const GLFWvidmode* mode = glfwGetVideoMode(monitor); const GLFWvidmode* mode = glfwGetVideoMode(monitor);
@ -149,7 +152,10 @@ int main(int argc, char** argv)
glfwIconifyWindow(window); glfwIconifyWindow(window);
if (nk_button_label(nk, "Restore")) if (nk_button_label(nk, "Restore"))
glfwRestoreWindow(window); glfwRestoreWindow(window);
if (nk_button_label(nk, "Hide (briefly)"))
nk_layout_row_dynamic(nk, 30, 2);
if (nk_button_label(nk, "Hide (for 3s)"))
{ {
glfwHideWindow(window); glfwHideWindow(window);
@ -159,6 +165,16 @@ int main(int argc, char** argv)
glfwShowWindow(window); glfwShowWindow(window);
} }
if (nk_button_label(nk, "Request Attention (after 3s)"))
{
glfwIconifyWindow(window);
const double time = glfwGetTime() + 3.0;
while (glfwGetTime() < time)
glfwWaitEventsTimeout(1.0);
glfwRequestWindowAttention(window);
}
nk_layout_row_dynamic(nk, 30, 1); nk_layout_row_dynamic(nk, 30, 1);
@ -211,7 +227,7 @@ int main(int argc, char** argv)
last_ypos = ypos; last_ypos = ypos;
} }
else else
nk_label(nk, "Position not supported", NK_TEXT_LEFT); nk_label(nk, "Platform does not support window position", NK_TEXT_LEFT);
nk_layout_row_dynamic(nk, 30, 3); nk_layout_row_dynamic(nk, 30, 3);
nk_label(nk, "Size", NK_TEXT_LEFT); nk_label(nk, "Size", NK_TEXT_LEFT);