Updates

Author: RobLoach

CMakeLists.txt

@@ -14,7 +14,7 @@ if (NOT nuklear_gamepad_FOUND)
     FetchContent_Declare(
         nuklear_gamepad
         GIT_REPOSITORY https://github.com/RobLoach/nuklear_gamepad.git
-        GIT_TAG 625d716
+        GIT_TAG 82056c3
     )
     FetchContent_GetProperties(nuklear_gamepad)
     if (NOT nuklear_gamepad_POPULATED)

README.md

@@ -44,7 +44,7 @@ int main() {
 
 ## Widgets
 
-Buttons, Checkboxes, Color Select, Comboboxes, Files, Directories, Gamepad Input Buttons, Labels, Properties, Sliders, Knobs, Radio Options, Images, Knob, Rows, TextEdit, Tree, Rule Horizontal, List View, Messages.
+Buttons, Checkboxes, Color Select, Comboboxes, Files, Directories, Gamepad Input Buttons, Labels, Properties, Sliders, Knobs, Radio Options, Images, Knob, Rows, TextEdit, Tree, Rule Horizontal, Keyboard Key, List View, Messages.
 
 ## API
 
@@ -97,7 +97,6 @@ void nk_console_set_active_widget(nk_console* widget);
 
 | Define | Description |
 | ------ | ----------- |
-| `NK_BUTTON_TRIGGER_ON_RELEASE` | When enabled, will allow for touch and drag to scroll the window |
 | `NK_CONSOLE_DRAG_THRESHOLD` | When using touch and drag to scroll, the amount of threshold movement needed to consider it a scroll |
 | `NK_CONSOLE_AXIS_DEADZONE` | The amount of movement the axis needs prior to moving the cursor |
 | `NK_CONSOLE_AXIS_REPEAT_INTERVAL` | When using the gamepad axis to move, how frequently the cursor will move |

demo/glfw/main.c

@@ -22,6 +22,7 @@
 #define NK_IMPLEMENTATION
 #define NK_GLFW_GL3_IMPLEMENTATION
 #define NK_KEYSTATE_BASED_INPUT
+#define NK_BUTTON_TRIGGER_ON_RELEASE
 #include "../../vendor/Nuklear/nuklear.h"
 #include "../../vendor/Nuklear/demo/glfw_opengl3/nuklear_glfw_gl3.h"
 

demo/raylib/main.c

@@ -16,7 +16,6 @@ void UpdateDrawFrame(void);
 
 struct nk_context *ctx;
 nk_bool closeWindow = nk_false;
-struct nk_rect lastWindowSize;
 
 int main() {
     SetConfigFlags(FLAG_WINDOW_RESIZABLE);
@@ -32,7 +31,6 @@ int main() {
     Texture texture = LoadTexture("resources/image.png");
 
     console = nuklear_console_demo_init(ctx, NULL, TextureToNuklearImage(texture));
-    lastWindowSize = nk_rect(0, 0, (float)GetScreenWidth() * 0.80f, (float)GetScreenHeight());
 
     #if defined(PLATFORM_WEB)
         emscripten_set_main_loop(UpdateDrawFrame, 0, 1);
@@ -62,20 +60,8 @@ void UpdateDrawFrame(void) {
 
     nk_gamepad_update(nk_console_get_gamepads(console));
 
-    int flags = NK_WINDOW_SCROLL_AUTO_HIDE;
-
-    // Center the window using the previous frame's rendered size, capped to screen
-    float windowW = lastWindowSize.w < GetScreenWidth() ? lastWindowSize.w : GetScreenWidth();
-    float windowH = lastWindowSize.h < GetScreenHeight() ? lastWindowSize.h : GetScreenHeight();
-    struct nk_rect centered = nk_rect(
-        (GetScreenWidth() - windowW) / 2.0f,
-        (GetScreenHeight() - windowH) / 2.0f,
-        windowW,
-        windowH
-    );
-
     // Nuklear GUI Code
-    lastWindowSize = nk_console_render_window(console, "nuklear_console", centered, flags);
+    nk_console_render_window(console, "nuklear_console", nk_rect(0, 0, (float)GetScreenWidth(), (float)GetScreenHeight()), NK_WINDOW_SCROLL_AUTO_HIDE);
 
     // Render
     BeginDrawing();

demo/sdl3_renderer/main.c

@@ -21,6 +21,7 @@
 #define NK_INCLUDE_DEFAULT_FONT
 #define NK_INCLUDE_COMMAND_USERDATA
 #define NK_INCLUDE_VERTEX_BUFFER_OUTPUT
+#define NK_BUTTON_TRIGGER_ON_RELEASE
 #define NK_IMPLEMENTATION
 #include "../../vendor/Nuklear/nuklear.h"
 

demo/sdl_renderer/main.c

@@ -20,6 +20,7 @@
 #define NK_INCLUDE_COMMAND_USERDATA
 #define NK_IMPLEMENTATION
 #define NK_SDL_RENDERER_IMPLEMENTATION
+#define NK_BUTTON_TRIGGER_ON_RELEASE
 #include "../../vendor/Nuklear/nuklear.h"
 #include "../../vendor/Nuklear/demo/sdl_renderer/nuklear_sdl_renderer.h"
 
@@ -112,7 +113,7 @@ int main(int argc, char *argv[]) {
         nk_input_begin(ctx);
 
         nk_gamepad_update(nk_console_get_gamepads(console));
-        
+
         while (SDL_PollEvent(&evt)) {
             if (evt.type == SDL_QUIT) goto cleanup;
             if (evt.type == SDL_KEYUP && evt.key.keysym.scancode == SDL_SCANCODE_ESCAPE) running = 0;

nuklear_console.h

@@ -312,6 +312,28 @@ NK_API nk_bool nk_console_navigate_to_path(nk_console* console, const char* path
 #ifndef NK_CONSOLE_IMPLEMENTATION_ONCE
 #define NK_CONSOLE_IMPLEMENTATION_ONCE
 
+#ifndef NK_BUTTON_TRIGGER_ON_RELEASE
+/**
+ * Define NK_BUTTON_TRIGGER_ON_RELEASE prior to nuklear.h.
+ *
+ * This is required because the input events are triggered incorrectly otherwise.
+ *
+ * @code
+ * #define NK_IMPLEMENTATION
+ * #define NK_BUTTON_TRIGGER_ON_RELEASE
+ * #include "nuklear.h"
+ *
+ * #define NK_CONSOLE_IMPLEMENTATION
+ * #include "nuklear_console.h"
+ * @endcode
+ *
+ * You are able to ignore this warning by using #define NK_CONSOLE_IGNORE_BUTTON_TRIGGER_ON_RELEASE
+ */
+#ifndef NK_CONSOLE_IGNORE_BUTTON_TRIGGER_ON_RELEASE
+#warning nuklear_console requires NK_BUTTON_TRIGGER_ON_RELEASE. Define it directly prior to #include "nuklear.h" .
+#endif
+#endif
+
 #ifndef NK_CONSOLE_AXIS_DEADZONE
 #define NK_CONSOLE_AXIS_DEADZONE 0.22f
 #endif
@@ -880,10 +902,6 @@ static void nk_console_axis_update(nk_console* console) {
  * Handles the Touch and Drag Scrolling.
  */
 static void nk_console_window_touch_drag(nk_console* console, nk_console_top_data* top_data) {
-#ifndef NK_BUTTON_TRIGGER_ON_RELEASE
-    NK_UNUSED(console);
-    NK_UNUSED(top_data);
-#else
     struct nk_input* in = &console->ctx->input;
     if (nk_window_is_hovered(console->ctx) && nk_input_is_mouse_pressed(in, NK_BUTTON_LEFT)) {
         top_data->drag_scroll_origin = in->mouse.pos;
@@ -906,7 +924,6 @@ static void nk_console_window_touch_drag(nk_console* console, nk_console_top_dat
     } else {
         top_data->drag_scroll_active = nk_false;
     }
-#endif
 }
 
 NK_API void nk_console_render(nk_console* console) {
@@ -1113,10 +1130,8 @@ NK_API struct nk_rect nk_console_render_window(nk_console* console, const char*
         float rendered_h = console->ctx->current->layout->at_y - console->ctx->current->layout->bounds.y + console->ctx->current->layout->row.height;
         window_bounds = nk_window_get_bounds(console->ctx);
         window_bounds.h = window_bounds.h - content.h + rendered_h;
-#ifdef NK_BUTTON_TRIGGER_ON_RELEASE
         top_data->drag_scroll_max_y = (nk_uint)NK_MAX(0.0f, rendered_h - content.h);
         top_data->drag_scroll_max_x = (nk_uint)NK_MAX(0.0f, console->ctx->current->layout->max_x - console->ctx->current->layout->bounds.x - content.w);
-#endif
     }
 
     // Finish the window processing.

nuklear_console_input.h

@@ -55,32 +55,6 @@ NK_API struct nk_rect nk_console_input_render(nk_console* widget);
 extern "C" {
 #endif
 
-/**
- * Get the name of a gamepad button.
- *
- * @param button The button to get the name of.
- *
- * @return The name of the button.
- */
-static const char* nk_console_input_button_name(enum nk_gamepad_button button) {
-    switch (button) {
-        case NK_GAMEPAD_BUTTON_INVALID: return "<None>";
-        case NK_GAMEPAD_BUTTON_A: return "A";
-        case NK_GAMEPAD_BUTTON_B: return "B";
-        case NK_GAMEPAD_BUTTON_X: return "X";
-        case NK_GAMEPAD_BUTTON_Y: return "Y";
-        case NK_GAMEPAD_BUTTON_LB: return "Left Bumper";
-        case NK_GAMEPAD_BUTTON_RB: return "Right Bumper";
-        case NK_GAMEPAD_BUTTON_BACK: return "Back";
-        case NK_GAMEPAD_BUTTON_START: return "Start";
-        case NK_GAMEPAD_BUTTON_UP: return "Up";
-        case NK_GAMEPAD_BUTTON_DOWN: return "Down";
-        case NK_GAMEPAD_BUTTON_LEFT: return "Left";
-        case NK_GAMEPAD_BUTTON_RIGHT: return "Right";
-        default: return "Unknown";
-    }
-}
-
 NK_API struct nk_rect nk_console_input_render(nk_console* console) {
     if (console == NULL || console->data == NULL) {
         return nk_rect(0, 0, 0, 0);
@@ -139,7 +113,10 @@ NK_API struct nk_rect nk_console_input_render(nk_console* console) {
     const char* swap_label = console->label;
     int swap_label_length = console->label_length;
     console->columns = 0;
-    console->label = nk_console_input_button_name(*data->out_gamepad_button);
+    console->label = (*data->out_gamepad_button < 0) ? "<None>" : nk_gamepad_button_name(nk_console_get_gamepads(console), *data->out_gamepad_button);
+    if (console->label == NULL) {
+        console->label = "Unknown";
+    }
     console->label_length = 0;
     struct nk_rect widget_bounds = nk_console_button_render(console);
     console->columns = swap_columns;

test/nuklear_console_test.c

@@ -12,6 +12,7 @@
 #define NK_INCLUDE_STANDARD_VARARGS
 #define NK_INCLUDE_DEFAULT_ALLOCATOR
 #define PNTR_NUKLEAR_IMPLEMENTATION
+#define NK_BUTTON_TRIGGER_ON_RELEASE
 #include "pntr_nuklear.h"
 
 #define NK_GAMEPAD_NONE