浏览代码

Add numpad enter to GLFW backends...

GL4 demo is crashing for me but it's nothing to do with my change
Robert Winkler 7 月之前
父节点
当前提交
706a56aadc

+ 1 - 1
demo/glfw_opengl2/main.c

@@ -42,7 +42,7 @@
 /* #define INCLUDE_CALCULATOR   */
 /* #define INCLUDE_CANVAS       */
 /* #define INCLUDE_FILE_BROWSER */
-/* #define INCLUDE_OVERVIEW     */
+#define INCLUDE_OVERVIEW
 /* #define INCLUDE_CONFIGURATOR */
 /* #define INCLUDE_NODE_EDITOR  */
 

+ 3 - 1
demo/glfw_opengl2/nuklear_glfw_gl2.h

@@ -327,7 +327,9 @@ nk_glfw3_new_frame(void)
         glfwSetInputMode(glfw.win, GLFW_CURSOR, GLFW_CURSOR_NORMAL);
 
     nk_input_key(ctx, NK_KEY_DEL, glfwGetKey(win, GLFW_KEY_DELETE) == GLFW_PRESS);
-    nk_input_key(ctx, NK_KEY_ENTER, glfwGetKey(win, GLFW_KEY_ENTER) == GLFW_PRESS);
+    nk_input_key(ctx, NK_KEY_ENTER, glfwGetKey(win, GLFW_KEY_ENTER) == GLFW_PRESS ||
+                                    glfwGetKey(win, GLFW_KEY_KP_ENTER) == GLFW_PRESS);
+
     nk_input_key(ctx, NK_KEY_TAB, glfwGetKey(win, GLFW_KEY_TAB) == GLFW_PRESS);
     nk_input_key(ctx, NK_KEY_BACKSPACE, glfwGetKey(win, GLFW_KEY_BACKSPACE) == GLFW_PRESS);
     nk_input_key(ctx, NK_KEY_UP, glfwGetKey(win, GLFW_KEY_UP) == GLFW_PRESS);

+ 3 - 1
demo/glfw_opengl3/nuklear_glfw_gl3.h

@@ -445,7 +445,9 @@ nk_glfw3_new_frame(struct nk_glfw* glfw)
 #endif
 
     nk_input_key(ctx, NK_KEY_DEL, glfwGetKey(win, GLFW_KEY_DELETE) == GLFW_PRESS);
-    nk_input_key(ctx, NK_KEY_ENTER, glfwGetKey(win, GLFW_KEY_ENTER) == GLFW_PRESS);
+    nk_input_key(ctx, NK_KEY_ENTER, glfwGetKey(win, GLFW_KEY_ENTER) == GLFW_PRESS ||
+                                    glfwGetKey(win, GLFW_KEY_KP_ENTER) == GLFW_PRESS);
+
     nk_input_key(ctx, NK_KEY_TAB, glfwGetKey(win, GLFW_KEY_TAB) == GLFW_PRESS);
     nk_input_key(ctx, NK_KEY_BACKSPACE, glfwGetKey(win, GLFW_KEY_BACKSPACE) == GLFW_PRESS);
     nk_input_key(ctx, NK_KEY_UP, glfwGetKey(win, GLFW_KEY_UP) == GLFW_PRESS);

+ 1 - 1
demo/glfw_opengl4/Makefile

@@ -2,7 +2,7 @@
 BIN = demo
 
 # Flags
-CFLAGS += -std=c89 -Wall -Wextra -pedantic
+CFLAGS += -g -std=c89 -Wall -Wextra -pedantic
 
 SRC = main.c
 OBJ = $(SRC:.c=.o)

+ 3 - 1
demo/glfw_opengl4/nuklear_glfw_gl4.h

@@ -587,7 +587,9 @@ nk_glfw3_new_frame(void)
 #endif
 
     nk_input_key(ctx, NK_KEY_DEL, glfwGetKey(win, GLFW_KEY_DELETE) == GLFW_PRESS);
-    nk_input_key(ctx, NK_KEY_ENTER, glfwGetKey(win, GLFW_KEY_ENTER) == GLFW_PRESS);
+    nk_input_key(ctx, NK_KEY_ENTER, glfwGetKey(win, GLFW_KEY_ENTER) == GLFW_PRESS ||
+                                    glfwGetKey(win, GLFW_KEY_KP_ENTER) == GLFW_PRESS);
+
     nk_input_key(ctx, NK_KEY_TAB, glfwGetKey(win, GLFW_KEY_TAB) == GLFW_PRESS);
     nk_input_key(ctx, NK_KEY_BACKSPACE, glfwGetKey(win, GLFW_KEY_BACKSPACE) == GLFW_PRESS);
     nk_input_key(ctx, NK_KEY_UP, glfwGetKey(win, GLFW_KEY_UP) == GLFW_PRESS);

+ 3 - 1
demo/glfw_vulkan/nuklear_glfw_vulkan.h

@@ -1272,7 +1272,9 @@ NK_API void nk_glfw3_new_frame(void) {
     nk_input_key(ctx, NK_KEY_DEL,
                  glfwGetKey(win, GLFW_KEY_DELETE) == GLFW_PRESS);
     nk_input_key(ctx, NK_KEY_ENTER,
-                 glfwGetKey(win, GLFW_KEY_ENTER) == GLFW_PRESS);
+                 glfwGetKey(win, GLFW_KEY_ENTER) == GLFW_PRESS ||
+                 glfwGetKey(win, GLFW_KEY_KP_ENTER) == GLFW_PRESS);
+
     nk_input_key(ctx, NK_KEY_TAB, glfwGetKey(win, GLFW_KEY_TAB) == GLFW_PRESS);
     nk_input_key(ctx, NK_KEY_BACKSPACE,
                  glfwGetKey(win, GLFW_KEY_BACKSPACE) == GLFW_PRESS);