From 72ee5782a744eb911040fbdda9db413972a80533 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Sat, 7 Mar 2026 11:45:43 -0500 Subject: [PATCH 01/18] Verify Nuklear.h is clean before running tests Fixes #890 --- .github/workflows/ccpp.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 7bd3efbd7..3fb0549d6 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -13,6 +13,10 @@ jobs: run: sudo apt-get update -qq - name: apt get demo-libs run: sudo apt-get install -y --no-install-recommends glslc liballegro5-dev liballegro-image5-dev liballegro-ttf5-dev libcairo2-dev libglfw3 libglfw3-dev libglew-dev libsdl2-dev libvulkan-dev libwayland-dev libx11-dev libxcb1-dev libxcb-util0-dev libxcb-keysyms1-dev libxft-dev libxkbcommon-x11-dev wayland-protocols + - name: Rebuild Nuklear.h + run: make nuke + - name: Verify Nuklear.h is Clean + run: git diff --exit-code nuklear.h - name: build allegro5 run: make -C demo/allegro5 - name: build glfw_opengl2 From 5757269c884b4a4d81c3bf325ade8147b178dddf Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Sat, 7 Mar 2026 11:47:22 -0500 Subject: [PATCH 02/18] Change src --- src/nuklear_color_picker.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nuklear_color_picker.c b/src/nuklear_color_picker.c index 114c3c119..f0790608e 100644 --- a/src/nuklear_color_picker.c +++ b/src/nuklear_color_picker.c @@ -3,7 +3,7 @@ /* ============================================================== * - * COLOR PICKER + * NOT COLOR PICKER * * ===============================================================*/ NK_LIB nk_bool From 24aabfcb3d046d608576271e43411e1c4b6cec93 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Sat, 7 Mar 2026 12:03:35 -0500 Subject: [PATCH 03/18] Revert "Change src" This reverts commit 5757269c884b4a4d81c3bf325ade8147b178dddf. --- src/nuklear_color_picker.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nuklear_color_picker.c b/src/nuklear_color_picker.c index f0790608e..114c3c119 100644 --- a/src/nuklear_color_picker.c +++ b/src/nuklear_color_picker.c @@ -3,7 +3,7 @@ /* ============================================================== * - * NOT COLOR PICKER + * COLOR PICKER * * ===============================================================*/ NK_LIB nk_bool From f4288bb170195e71af9da7c27387fdbad60959b5 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Sat, 7 Mar 2026 12:11:59 -0500 Subject: [PATCH 04/18] Update docs --- .github/workflows/ccpp.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 3fb0549d6..ac7a7e492 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -13,10 +13,14 @@ jobs: run: sudo apt-get update -qq - name: apt get demo-libs run: sudo apt-get install -y --no-install-recommends glslc liballegro5-dev liballegro-image5-dev liballegro-ttf5-dev libcairo2-dev libglfw3 libglfw3-dev libglew-dev libsdl2-dev libvulkan-dev libwayland-dev libx11-dev libxcb1-dev libxcb-util0-dev libxcb-keysyms1-dev libxft-dev libxkbcommon-x11-dev wayland-protocols + + # Verify Nuklear.h is clean - name: Rebuild Nuklear.h run: make nuke - - name: Verify Nuklear.h is Clean + - name: Verify `build.py` was run run: git diff --exit-code nuklear.h + + # Build the Demos - name: build allegro5 run: make -C demo/allegro5 - name: build glfw_opengl2 From 2c78e1fca29e7d7ebc50b743f5d9caf96000a183 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Sat, 7 Mar 2026 12:34:37 -0500 Subject: [PATCH 05/18] Testing adding to only nuklear.h --- nuklear.h | 1 + 1 file changed, 1 insertion(+) diff --git a/nuklear.h b/nuklear.h index aee190eb8..86d3d035c 100644 --- a/nuklear.h +++ b/nuklear.h @@ -17792,6 +17792,7 @@ nk_font_atlas_add(struct nk_font_atlas *atlas, const struct nk_font_config *conf NK_ASSERT(config->ttf_size); NK_ASSERT(config->size > 0.0f); + // Adding stuff to Amagamation. if (!atlas || !config || !config->ttf_blob || !config->ttf_size || config->size <= 0.0f|| !atlas->permanent.alloc || !atlas->permanent.free || !atlas->temporary.alloc || !atlas->temporary.free) From f56fc25e93159ee408eaaaaea52caf2ed8a505d3 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Sat, 7 Mar 2026 12:56:57 -0500 Subject: [PATCH 06/18] Update .github/workflows/ccpp.yml Co-authored-by: sleeptightAnsiC <91839286+sleeptightAnsiC@users.noreply.github.com> --- .github/workflows/ccpp.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index ac7a7e492..65dfa5d96 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -14,11 +14,14 @@ jobs: - name: apt get demo-libs run: sudo apt-get install -y --no-install-recommends glslc liballegro5-dev liballegro-image5-dev liballegro-ttf5-dev libcairo2-dev libglfw3 libglfw3-dev libglew-dev libsdl2-dev libvulkan-dev libwayland-dev libx11-dev libxcb1-dev libxcb-util0-dev libxcb-keysyms1-dev libxft-dev libxkbcommon-x11-dev wayland-protocols - # Verify Nuklear.h is clean - - name: Rebuild Nuklear.h - run: make nuke - - name: Verify `build.py` was run - run: git diff --exit-code nuklear.h + # Verify ./nuklear.h mirrors ./src/* + - name: Verify ./nuklear.h + run: make nuke && \ + if ! git diff --exit-code nuklear.h ; then \ + echo "Did you forgot to rebuild ./nuklear.h ?" >/dev/stderr ; \ + echo "Make sure to apply your changes to ./src/* first, and only then rebuild the amalgamation with ./src/paq* !" >/dev/stderr ; \ + exit 1 ; \ + fi ; # Build the Demos - name: build allegro5 From c2a909bdd53d3bbd2735c9533386b1a70c9a8724 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Sat, 7 Mar 2026 13:38:44 -0500 Subject: [PATCH 07/18] Move to use a Makefile command --- .github/workflows/ccpp.yml | 9 +++------ Makefile | 12 +++++++----- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 65dfa5d96..66a8b8650 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -15,13 +15,10 @@ jobs: run: sudo apt-get install -y --no-install-recommends glslc liballegro5-dev liballegro-image5-dev liballegro-ttf5-dev libcairo2-dev libglfw3 libglfw3-dev libglew-dev libsdl2-dev libvulkan-dev libwayland-dev libx11-dev libxcb1-dev libxcb-util0-dev libxcb-keysyms1-dev libxft-dev libxkbcommon-x11-dev wayland-protocols # Verify ./nuklear.h mirrors ./src/* + - name: Rebuild ./nuklear.h + run: make nuke - name: Verify ./nuklear.h - run: make nuke && \ - if ! git diff --exit-code nuklear.h ; then \ - echo "Did you forgot to rebuild ./nuklear.h ?" >/dev/stderr ; \ - echo "Make sure to apply your changes to ./src/* first, and only then rebuild the amalgamation with ./src/paq* !" >/dev/stderr ; \ - exit 1 ; \ - fi ; + run: make test-nuke # Build the Demos - name: build allegro5 diff --git a/Makefile b/Makefile index f0fe41f74..48561ca83 100644 --- a/Makefile +++ b/Makefile @@ -21,9 +21,9 @@ INTRO = HEADER.md PUB = nuklear.h OUTPUT = nuklear.h -PRIV1 = nuklear_internal.h nuklear_math.c nuklear_util.c nuklear_color.c nuklear_utf8.c nuklear_buffer.c nuklear_string.c nuklear_draw.c nuklear_vertex.c +PRIV1 = nuklear_internal.h nuklear_math.c nuklear_util.c nuklear_color.c nuklear_utf8.c nuklear_buffer.c nuklear_string.c nuklear_draw.c nuklear_vertex.c -EXTERN = stb_rect_pack.h stb_truetype.h +EXTERN = stb_rect_pack.h stb_truetype.h PRIV2 = nuklear_font.c nuklear_input.c nuklear_style.c nuklear_context.c nuklear_pool.c nuklear_page_element.c nuklear_table.c nuklear_panel.c nuklear_window.c nuklear_popup.c nuklear_contextual.c nuklear_menu.c nuklear_layout.c nuklear_tree.c nuklear_group.c nuklear_list_view.c nuklear_widget.c nuklear_text.c nuklear_image.c nuklear_9slice.c nuklear_button.c nuklear_toggle.c nuklear_selectable.c nuklear_slider.c nuklear_knob.c nuklear_progress.c nuklear_scrollbar.c nuklear_text_editor.c nuklear_edit.c nuklear_property.c nuklear_chart.c nuklear_color_picker.c nuklear_combo.c nuklear_tooltip.c @@ -45,7 +45,7 @@ usage: echo "make demos to build all of the demos" echo "make all to re-pack the header and create documentation" -all: docs nuke demos +all: docs nuke demos demos: $(DEMO_LIST) @@ -55,14 +55,16 @@ demos: $(DEMO_LIST) nuke: $(addprefix $(SRC_PATH)/, $(SRC)) python3 $(SRC_PATH)/build.py --macro $(MACRO) --intro $(addprefix $(SRC_PATH)/, $(INTRO)) --pub $(addprefix $(SRC_PATH)/, $(PUB)) --priv1 "$(addprefix $(SRC_PATH)/, $(PRIV1))" --extern "$(addprefix $(SRC_PATH)/, $(EXTERN))" --priv2 "$(addprefix $(SRC_PATH)/, $(PRIV2))" --outro "$(addprefix $(SRC_PATH)/, $(OUTRO))" > $(OUTPUT) - +test-nuke: + @git diff --exit-code nuklear.h || (echo "Error: nuklear.h does not match sources. Ensure changes reflect src/*, and rebuild with ./src/paq" && exit 1) + @echo "nuklear.h matches sources" ######################################################################################## ## Docs -docs: $(DOCS_PATH)/html/index.html +docs: $(DOCS_PATH)/html/index.html $(DOCS_PATH)/html/index.html: $(DOCS_PATH)/doxygen-awesome-css/doxygen-awesome.css $(DOXYFILE) doxygen $(DOXYFILE) From 6fd7669bebf746a0e93de8a2871ffa729111a457 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Sat, 7 Mar 2026 13:58:45 -0500 Subject: [PATCH 08/18] Update --- .github/workflows/ccpp.yml | 12 ++++++------ Makefile | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 66a8b8650..701e57438 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -9,17 +9,17 @@ jobs: steps: - uses: actions/checkout@v4 + + - name: Verify ./nuklear.h matches sources + run: | + make nuke + make nuke-test + - name: apt-update run: sudo apt-get update -qq - name: apt get demo-libs run: sudo apt-get install -y --no-install-recommends glslc liballegro5-dev liballegro-image5-dev liballegro-ttf5-dev libcairo2-dev libglfw3 libglfw3-dev libglew-dev libsdl2-dev libvulkan-dev libwayland-dev libx11-dev libxcb1-dev libxcb-util0-dev libxcb-keysyms1-dev libxft-dev libxkbcommon-x11-dev wayland-protocols - # Verify ./nuklear.h mirrors ./src/* - - name: Rebuild ./nuklear.h - run: make nuke - - name: Verify ./nuklear.h - run: make test-nuke - # Build the Demos - name: build allegro5 run: make -C demo/allegro5 diff --git a/Makefile b/Makefile index 48561ca83..401a36f9d 100644 --- a/Makefile +++ b/Makefile @@ -55,8 +55,8 @@ demos: $(DEMO_LIST) nuke: $(addprefix $(SRC_PATH)/, $(SRC)) python3 $(SRC_PATH)/build.py --macro $(MACRO) --intro $(addprefix $(SRC_PATH)/, $(INTRO)) --pub $(addprefix $(SRC_PATH)/, $(PUB)) --priv1 "$(addprefix $(SRC_PATH)/, $(PRIV1))" --extern "$(addprefix $(SRC_PATH)/, $(EXTERN))" --priv2 "$(addprefix $(SRC_PATH)/, $(PRIV2))" --outro "$(addprefix $(SRC_PATH)/, $(OUTRO))" > $(OUTPUT) -test-nuke: - @git diff --exit-code nuklear.h || (echo "Error: nuklear.h does not match sources. Ensure changes reflect src/*, and rebuild with ./src/paq" && exit 1) +nuke-test: + @git diff --exit-code nuklear.h || (echo "Error: nuklear.h does not match sources. To fix this...\n1. Apply changes to ./src/*\n2. Rebuild with ./src/paq*" >/dev/stderr && exit 1) @echo "nuklear.h matches sources" From 383c9222361cd0d23cb32eb80a74f6aedb4b2155 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Sat, 7 Mar 2026 14:01:15 -0500 Subject: [PATCH 09/18] Tweak --- .github/workflows/ccpp.yml | 8 ++++---- Makefile | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 701e57438..1c2cb1b81 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -10,10 +10,10 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Verify ./nuklear.h matches sources - run: | - make nuke - make nuke-test + - name: Rebuild ./nuklear.h + run: make nuke + - name: Verify ./nuklear.h + run: make nuke-test - name: apt-update run: sudo apt-get update -qq diff --git a/Makefile b/Makefile index 401a36f9d..5bed14028 100644 --- a/Makefile +++ b/Makefile @@ -56,7 +56,7 @@ nuke: $(addprefix $(SRC_PATH)/, $(SRC)) python3 $(SRC_PATH)/build.py --macro $(MACRO) --intro $(addprefix $(SRC_PATH)/, $(INTRO)) --pub $(addprefix $(SRC_PATH)/, $(PUB)) --priv1 "$(addprefix $(SRC_PATH)/, $(PRIV1))" --extern "$(addprefix $(SRC_PATH)/, $(EXTERN))" --priv2 "$(addprefix $(SRC_PATH)/, $(PRIV2))" --outro "$(addprefix $(SRC_PATH)/, $(OUTRO))" > $(OUTPUT) nuke-test: - @git diff --exit-code nuklear.h || (echo "Error: nuklear.h does not match sources. To fix this...\n1. Apply changes to ./src/*\n2. Rebuild with ./src/paq*" >/dev/stderr && exit 1) + @git diff --exit-code nuklear.h || (echo "Error: nuklear.h does not match sources. To fix...\n1. Apply changes to ./src/*\n2. Rebuild with ./src/paq*" >/dev/stderr && exit 1) @echo "nuklear.h matches sources" From 2394e9450f71471097bb4ad96e7eb219450edf66 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Sat, 7 Mar 2026 14:09:14 -0500 Subject: [PATCH 10/18] Tweak again --- Makefile | 7 ++++++- nuklear.h | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5bed14028..7c98e5f69 100644 --- a/Makefile +++ b/Makefile @@ -56,7 +56,12 @@ nuke: $(addprefix $(SRC_PATH)/, $(SRC)) python3 $(SRC_PATH)/build.py --macro $(MACRO) --intro $(addprefix $(SRC_PATH)/, $(INTRO)) --pub $(addprefix $(SRC_PATH)/, $(PUB)) --priv1 "$(addprefix $(SRC_PATH)/, $(PRIV1))" --extern "$(addprefix $(SRC_PATH)/, $(EXTERN))" --priv2 "$(addprefix $(SRC_PATH)/, $(PRIV2))" --outro "$(addprefix $(SRC_PATH)/, $(OUTRO))" > $(OUTPUT) nuke-test: - @git diff --exit-code nuklear.h || (echo "Error: nuklear.h does not match sources. To fix...\n1. Apply changes to ./src/*\n2. Rebuild with ./src/paq*" >/dev/stderr && exit 1) + @git diff --exit-code nuklear.h || (\ + echo "\nError: nuklear.h does not match sources. To fix...\n\ + 1. Apply changes to ./src/*\n\ + 2. Rebuild with ./src/paq*\n" >/dev/stderr && \ + exit 1\ + ) @echo "nuklear.h matches sources" diff --git a/nuklear.h b/nuklear.h index 86d3d035c..a4564c276 100644 --- a/nuklear.h +++ b/nuklear.h @@ -17797,7 +17797,7 @@ nk_font_atlas_add(struct nk_font_atlas *atlas, const struct nk_font_config *conf !atlas->permanent.alloc || !atlas->permanent.free || !atlas->temporary.alloc || !atlas->temporary.free) return 0; - +d /* allocate font config */ cfg = (struct nk_font_config*) atlas->permanent.alloc(atlas->permanent.userdata,0, sizeof(struct nk_font_config)); From 8ee2187b59349f75cf2f874826994f8865a67afb Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Sat, 7 Mar 2026 14:21:22 -0500 Subject: [PATCH 11/18] Update .github/workflows/ccpp.yml --- .github/workflows/ccpp.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 1c2cb1b81..9fd4d3d9b 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -19,8 +19,6 @@ jobs: run: sudo apt-get update -qq - name: apt get demo-libs run: sudo apt-get install -y --no-install-recommends glslc liballegro5-dev liballegro-image5-dev liballegro-ttf5-dev libcairo2-dev libglfw3 libglfw3-dev libglew-dev libsdl2-dev libvulkan-dev libwayland-dev libx11-dev libxcb1-dev libxcb-util0-dev libxcb-keysyms1-dev libxft-dev libxkbcommon-x11-dev wayland-protocols - - # Build the Demos - name: build allegro5 run: make -C demo/allegro5 - name: build glfw_opengl2 From 8da655e04636f0e2ac3f45bd9a3dcaac63e31cd2 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Sat, 7 Mar 2026 20:24:11 -0500 Subject: [PATCH 12/18] Update --- .github/workflows/ccpp.yml | 13 +++++++++---- Makefile | 9 --------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 9fd4d3d9b..4330b2943 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -10,10 +10,15 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Rebuild ./nuklear.h - run: make nuke - - name: Verify ./nuklear.h - run: make nuke-test + - name: Ensure ./nuklear.h matches sources + run: make nuke && git diff --exit-code nuklear.h + + - name: Need to Rebuild ./nuklear.h + if: failure() + run: | + echo "Error: nuklear.h does not match sources. To fix:" + echo "1. Apply changes to ./src/*" + echo "2. Rebuild with 'make nuke'" - name: apt-update run: sudo apt-get update -qq diff --git a/Makefile b/Makefile index 7c98e5f69..dc414dabd 100644 --- a/Makefile +++ b/Makefile @@ -55,15 +55,6 @@ demos: $(DEMO_LIST) nuke: $(addprefix $(SRC_PATH)/, $(SRC)) python3 $(SRC_PATH)/build.py --macro $(MACRO) --intro $(addprefix $(SRC_PATH)/, $(INTRO)) --pub $(addprefix $(SRC_PATH)/, $(PUB)) --priv1 "$(addprefix $(SRC_PATH)/, $(PRIV1))" --extern "$(addprefix $(SRC_PATH)/, $(EXTERN))" --priv2 "$(addprefix $(SRC_PATH)/, $(PRIV2))" --outro "$(addprefix $(SRC_PATH)/, $(OUTRO))" > $(OUTPUT) -nuke-test: - @git diff --exit-code nuklear.h || (\ - echo "\nError: nuklear.h does not match sources. To fix...\n\ - 1. Apply changes to ./src/*\n\ - 2. Rebuild with ./src/paq*\n" >/dev/stderr && \ - exit 1\ - ) - @echo "nuklear.h matches sources" - ######################################################################################## From 3af1ece50769fd107a382218c2a824cf2943e952 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Sat, 7 Mar 2026 20:28:21 -0500 Subject: [PATCH 13/18] Update --- .github/workflows/ccpp.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 4330b2943..1244c9d2a 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -10,15 +10,12 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Ensure ./nuklear.h matches sources - run: make nuke && git diff --exit-code nuklear.h + - name: Rebuild ./nuklear.h + run: make nuke - - name: Need to Rebuild ./nuklear.h - if: failure() + - name: Ensure ./nuklear.h matches sources run: | - echo "Error: nuklear.h does not match sources. To fix:" - echo "1. Apply changes to ./src/*" - echo "2. Rebuild with 'make nuke'" + git diff --exit-code nuklear.h || (echo "Error: nuklear.h does not match sources. To fix:\n1. Apply changes to ./src/*\n2. Rebuild with 'make nuke' && exit 1)" - name: apt-update run: sudo apt-get update -qq From ea8828003404d622e5f78e09b24a58539a169e0b Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Sat, 7 Mar 2026 20:29:23 -0500 Subject: [PATCH 14/18] Fix quote --- .github/workflows/ccpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 1244c9d2a..089febb6e 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -15,7 +15,7 @@ jobs: - name: Ensure ./nuklear.h matches sources run: | - git diff --exit-code nuklear.h || (echo "Error: nuklear.h does not match sources. To fix:\n1. Apply changes to ./src/*\n2. Rebuild with 'make nuke' && exit 1)" + git diff --exit-code nuklear.h || (echo "Error: nuklear.h does not match sources. To fix:\n1. Apply changes to ./src/*\n2. Rebuild with 'make nuke'" && exit 1) - name: apt-update run: sudo apt-get update -qq From 55778ccb9c4708278e2b051f10d96637fb12e03f Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Sat, 7 Mar 2026 20:31:21 -0500 Subject: [PATCH 15/18] Use Printf instead --- .github/workflows/ccpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 089febb6e..def2c06f2 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -15,7 +15,7 @@ jobs: - name: Ensure ./nuklear.h matches sources run: | - git diff --exit-code nuklear.h || (echo "Error: nuklear.h does not match sources. To fix:\n1. Apply changes to ./src/*\n2. Rebuild with 'make nuke'" && exit 1) + git diff --exit-code nuklear.h || (printf "\nError: nuklear.h does not match sources. To fix:\n1. Apply changes to ./src/*\n2. Rebuild with 'make nuke'\n" && exit 1) - name: apt-update run: sudo apt-get update -qq From c03640d858f25d4b66e4c694a6a0fac1bfd79344 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Sat, 7 Mar 2026 20:34:14 -0500 Subject: [PATCH 16/18] Fix formatting issues in Makefile --- Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index dc414dabd..f0fe41f74 100644 --- a/Makefile +++ b/Makefile @@ -21,9 +21,9 @@ INTRO = HEADER.md PUB = nuklear.h OUTPUT = nuklear.h -PRIV1 = nuklear_internal.h nuklear_math.c nuklear_util.c nuklear_color.c nuklear_utf8.c nuklear_buffer.c nuklear_string.c nuklear_draw.c nuklear_vertex.c +PRIV1 = nuklear_internal.h nuklear_math.c nuklear_util.c nuklear_color.c nuklear_utf8.c nuklear_buffer.c nuklear_string.c nuklear_draw.c nuklear_vertex.c -EXTERN = stb_rect_pack.h stb_truetype.h +EXTERN = stb_rect_pack.h stb_truetype.h PRIV2 = nuklear_font.c nuklear_input.c nuklear_style.c nuklear_context.c nuklear_pool.c nuklear_page_element.c nuklear_table.c nuklear_panel.c nuklear_window.c nuklear_popup.c nuklear_contextual.c nuklear_menu.c nuklear_layout.c nuklear_tree.c nuklear_group.c nuklear_list_view.c nuklear_widget.c nuklear_text.c nuklear_image.c nuklear_9slice.c nuklear_button.c nuklear_toggle.c nuklear_selectable.c nuklear_slider.c nuklear_knob.c nuklear_progress.c nuklear_scrollbar.c nuklear_text_editor.c nuklear_edit.c nuklear_property.c nuklear_chart.c nuklear_color_picker.c nuklear_combo.c nuklear_tooltip.c @@ -45,7 +45,7 @@ usage: echo "make demos to build all of the demos" echo "make all to re-pack the header and create documentation" -all: docs nuke demos +all: docs nuke demos demos: $(DEMO_LIST) @@ -57,10 +57,12 @@ nuke: $(addprefix $(SRC_PATH)/, $(SRC)) + + ######################################################################################## ## Docs -docs: $(DOCS_PATH)/html/index.html +docs: $(DOCS_PATH)/html/index.html $(DOCS_PATH)/html/index.html: $(DOCS_PATH)/doxygen-awesome-css/doxygen-awesome.css $(DOXYFILE) doxygen $(DOXYFILE) From 75e17f9f52872f973405fa106e3e3bf0e2b2f882 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Sat, 7 Mar 2026 20:35:11 -0500 Subject: [PATCH 17/18] Fix allocation check in font configuration --- nuklear.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nuklear.h b/nuklear.h index a4564c276..86d3d035c 100644 --- a/nuklear.h +++ b/nuklear.h @@ -17797,7 +17797,7 @@ nk_font_atlas_add(struct nk_font_atlas *atlas, const struct nk_font_config *conf !atlas->permanent.alloc || !atlas->permanent.free || !atlas->temporary.alloc || !atlas->temporary.free) return 0; -d + /* allocate font config */ cfg = (struct nk_font_config*) atlas->permanent.alloc(atlas->permanent.userdata,0, sizeof(struct nk_font_config)); From be065fce4a24f0d074467995ef689d38d11fb352 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Sun, 8 Mar 2026 17:52:02 -0400 Subject: [PATCH 18/18] Remove comment from validation checks Removed comment about adding to Amagamation. --- nuklear.h | 1 - 1 file changed, 1 deletion(-) diff --git a/nuklear.h b/nuklear.h index 86d3d035c..aee190eb8 100644 --- a/nuklear.h +++ b/nuklear.h @@ -17792,7 +17792,6 @@ nk_font_atlas_add(struct nk_font_atlas *atlas, const struct nk_font_config *conf NK_ASSERT(config->ttf_size); NK_ASSERT(config->size > 0.0f); - // Adding stuff to Amagamation. if (!atlas || !config || !config->ttf_blob || !config->ttf_size || config->size <= 0.0f|| !atlas->permanent.alloc || !atlas->permanent.free || !atlas->temporary.alloc || !atlas->temporary.free)