From 7216815536a011d51427495ffcdce969a808c5ea Mon Sep 17 00:00:00 2001 From: Daniel Mayovskiy Date: Wed, 22 Oct 2025 18:57:11 -0700 Subject: [PATCH] Fixed termbox2 demo build, added scroll functionality (#523) --- examples/termbox2-demo/CMakeLists.txt | 4 ++-- examples/termbox2-demo/main.c | 13 +++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/examples/termbox2-demo/CMakeLists.txt b/examples/termbox2-demo/CMakeLists.txt index 20d9026..12af602 100644 --- a/examples/termbox2-demo/CMakeLists.txt +++ b/examples/termbox2-demo/CMakeLists.txt @@ -8,7 +8,7 @@ set(FETCHCONTENT_QUIET FALSE) FetchContent_Declare( termbox2 GIT_REPOSITORY "https://github.com/termbox/termbox2.git" - GIT_TAG "9c9281a9a4c971a2be57f8645e828ec99fd555e8" + GIT_TAG "ffd159c2a6106dd5eef338a6702ad15d4d4aa809" GIT_PROGRESS TRUE GIT_SHALLOW TRUE ) @@ -17,7 +17,7 @@ FetchContent_MakeAvailable(termbox2) FetchContent_Declare( stb GIT_REPOSITORY "https://github.com/nothings/stb.git" - GIT_TAG "f58f558c120e9b32c217290b80bad1a0729fbb2c" + GIT_TAG "fede005abaf93d9d7f3a679d1999b2db341b360f" GIT_PROGRESS TRUE GIT_SHALLOW TRUE ) diff --git a/examples/termbox2-demo/main.c b/examples/termbox2-demo/main.c index 601a9a5..430b0f4 100644 --- a/examples/termbox2-demo/main.c +++ b/examples/termbox2-demo/main.c @@ -90,7 +90,7 @@ void component_text_pair(const char *key, const char *value) void component_termbox_settings(void) { - CLAY_AUTO_ID({ + CLAY(CLAY_ID("Termbox Settings"), { .floating = { .attachTo = CLAY_ATTACH_TO_PARENT, .zIndex = 1, @@ -509,13 +509,18 @@ Clay_RenderCommandArray CreateLayout(clay_tb_image *image1, clay_tb_image *image { Clay_BeginLayout(); CLAY_AUTO_ID({ + .clip = { + .vertical = false, + .horizontal = true, + .childOffset = Clay_GetScrollOffset(), + }, .layout = { .sizing = { .width = CLAY_SIZING_GROW(), .height = CLAY_SIZING_GROW() }, .childAlignment = { - .x = CLAY_ALIGN_X_CENTER, + .x = CLAY_ALIGN_X_LEFT, .y = CLAY_ALIGN_Y_CENTER }, .childGap = 64 @@ -714,12 +719,12 @@ void handle_termbox_events(void) break; } case TB_KEY_MOUSE_WHEEL_UP: { - Clay_Vector2 scrollDelta = { 0, 1 * Clay_Termbox_Cell_Height() }; + Clay_Vector2 scrollDelta = { 0.5 * Clay_Termbox_Cell_Width(), 0 }; Clay_UpdateScrollContainers(false, scrollDelta, 1); break; } case TB_KEY_MOUSE_WHEEL_DOWN: { - Clay_Vector2 scrollDelta = { 0, -1 * Clay_Termbox_Cell_Height() }; + Clay_Vector2 scrollDelta = { -0.5 * Clay_Termbox_Cell_Width(), 0 }; Clay_UpdateScrollContainers(false, scrollDelta, 1); break; }