TweakS

Author: RobLoach

README.md

@@ -97,6 +97,7 @@ void nk_console_set_active_widget(nk_console* widget);
 
 | Define | Description |
 | ------ | ----------- |
+| `NK_BUTTON_TRIGGER_ON_RELEASE` | When enabled, will allow touch drag scrolling controls
 | `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/sdl3_renderer/main.c

@@ -177,6 +177,8 @@ SDL_AppResult SDL_AppIterate(void *appstate) {
     SDL_RenderClear(app->renderer);
 
     nk_sdl_render(ctx, NK_ANTI_ALIASING_ON);
+
+    // The SDL Renderer allows handling SDL_StartTextInput()
     nk_console_sdl_update_text_input(app->console, app->window);
 
     SDL_RenderPresent(app->renderer);

demo/sdl_renderer/main.c

@@ -138,6 +138,8 @@ int main(int argc, char *argv[]) {
         SDL_RenderClear(renderer);
 
         nk_sdl_render(NK_ANTI_ALIASING_ON);
+
+        // The SDL Renderer allows handling SDL_StartTextInput()
         nk_console_sdl_update_text_input(console, win);
 
         SDL_RenderPresent(renderer);

nuklear_console.h

@@ -316,11 +316,11 @@ NK_API nk_bool nk_console_navigate_to_path(nk_console* console, const char* path
 /**
  * Define NK_BUTTON_TRIGGER_ON_RELEASE prior to nuklear.h.
  *
- * This is required because the input events are triggered incorrectly otherwise.
+ * This is required because the input events are triggered incorrectly otherwise, resulting in undesirable behavior.
  *
  * @code
- * #define NK_IMPLEMENTATION
  * #define NK_BUTTON_TRIGGER_ON_RELEASE
+ * #define NK_IMPLEMENTATION
  * #include "nuklear.h"
  *
  * #define NK_CONSOLE_IMPLEMENTATION
@@ -330,7 +330,7 @@ NK_API nk_bool nk_console_navigate_to_path(nk_console* console, const char* path
  * 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" .
+#warning "nuklear_console requires NK_BUTTON_TRIGGER_ON_RELEASE. Add #define NK_BUTTON_TRIGGER_ON_RELEASE prior to #define NK_IMPLEMENTATION ."
 #endif
 #endif
 
@@ -994,6 +994,15 @@ NK_API void nk_console_render(nk_console* console) {
                 cvector_clear(console->events);
             }
         }
+
+        // Update drag scroll bounds so they're valid when nk_console_render is called directly (e.g. SDL/GLFW demos) rather than via nk_console_render_window.
+        if (console->ctx->current != NULL) {
+            struct nk_rect content = nk_window_get_content_region(console->ctx);
+            float rendered_h = console->ctx->current->layout->at_y - console->ctx->current->layout->bounds.y + console->ctx->current->layout->row.height;
+            data->drag_scroll_max_y = (nk_uint)NK_MAX(0.0f, rendered_h - content.h);
+            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);
+        }
+
         return;
     }
 

nuklear_console_input.h

@@ -126,6 +126,14 @@ NK_API struct nk_rect nk_console_input_render(nk_console* console) {
     return widget_bounds;
 }
 
+/**
+ * Go back as a post-render hook so that it handles the events safely afterwards.
+ */
+static void nk_console_input_back_post_render(nk_console* console, void* user_data) {
+    NK_UNUSED(user_data);
+    nk_console_button_back(console, NULL);
+}
+
 /**
  * Render the "Press a Button" prompt.
  *
@@ -200,7 +208,7 @@ static struct nk_rect nk_console_input_active_render(nk_console* console) {
     if (finished == nk_true) {
         top_data->input_processed = nk_true;
         data->timer = 0.0f;
-        nk_console_button_back(console, NULL);
+        nk_console_add_event(console, NK_CONSOLE_EVENT_POST_RENDER_ONCE, &nk_console_input_back_post_render);
     }
 
     return nk_rect(0, 0, 0, 0);

nuklear_console_key.h

@@ -38,6 +38,10 @@ extern "C" {
  */
 NK_API nk_console* nk_console_key(nk_console* parent, const char* label, nk_rune* out_key);
 NK_API struct nk_rect nk_console_key_render(nk_console* widget);
+
+/**
+ * Retrieves the name of the of the given Nuklear rune.
+ */
 NK_API const char* nk_console_key_name(nk_rune key);
 
 #if defined(__cplusplus)
@@ -86,7 +90,7 @@ NK_API const char* nk_console_key_name(nk_rune key) {
             case NK_KEY_RIGHT: return "Right";
             case NK_KEY_TEXT_INSERT_MODE: return "Insert";
             case NK_KEY_TEXT_REPLACE_MODE: return "Replace";
-            case NK_KEY_TEXT_RESET_MODE: return "Reset Mode";
+            case NK_KEY_TEXT_RESET_MODE: return "Escape"; // Nuklear uses ESCAPE as Reset Mode
             case NK_KEY_TEXT_LINE_START: return "Home";
             case NK_KEY_TEXT_LINE_END: return "End";
             case NK_KEY_TEXT_START: return "Ctrl+Home";
@@ -155,6 +159,14 @@ NK_API struct nk_rect nk_console_key_render(nk_console* console) {
     return widget_bounds;
 }
 
+/**
+ * Go back as a post-render hook so that it handles the events safely afterwards.
+ */
+static void nk_console_key_back_post_render(nk_console* console, void* user_data) {
+    NK_UNUSED(user_data);
+    nk_console_button_back(console, NULL);
+}
+
 /**
  * Render the "Press a Key" capture prompt.
  */
@@ -248,7 +260,7 @@ static struct nk_rect nk_console_key_active_render(nk_console* console) {
     if (finished == nk_true) {
         top_data->input_processed = nk_true;
         data->timer = 0.0f;
-        nk_console_button_back(console, NULL);
+        nk_console_add_event(console, NK_CONSOLE_EVENT_POST_RENDER_ONCE, &nk_console_key_back_post_render);
     }
 
     return nk_rect(0, 0, 0, 0);