Merge 727352a548 into 588b93196c

[Renderers/termbox] Fixing termbox2-image-demo build error (#524 )
[bindings/odin] Update Odin bindings
2025-11-07 13:26:17 +00:00 · 2025-10-02 08:37:23 +02:00 · 2025-10-02 11:21:11 +10:00 · 2025-10-02 01:17:05 +00:00 · 2025-10-02 11:14:17 +10:00
7 changed files with 12 additions and 4 deletions
--- a/bindings/odin/clay-odin/linux/clay.a
+++ b/bindings/odin/clay-odin/linux/clay.a
--- a/bindings/odin/clay-odin/macos-arm64/clay.a
+++ b/bindings/odin/clay-odin/macos-arm64/clay.a
--- a/bindings/odin/clay-odin/macos/clay.a
+++ b/bindings/odin/clay-odin/macos/clay.a
--- a/bindings/odin/clay-odin/wasm/clay.o
+++ b/bindings/odin/clay-odin/wasm/clay.o
--- a/bindings/odin/clay-odin/windows/clay.lib
+++ b/bindings/odin/clay-odin/windows/clay.lib
--- a/clay.h
+++ b/clay.h
@ -1146,6 +1146,7 @@ typedef struct {
    Clay_LayoutConfig *layoutConfig;
    Clay__ElementConfigArraySlice elementConfigs;
    uint32_t id;
+    uint16_t floatingChildrenCount;
 } Clay_LayoutElement;

 CLAY__ARRAY_DEFINE(Clay_LayoutElement, Clay_LayoutElementArray)
@ -1776,7 +1777,8 @@ Clay_LayoutElementHashMapItem *Clay__GetHashMapItem(uint32_t id) {
 Clay_ElementId Clay__GenerateIdForAnonymousElement(Clay_LayoutElement *openLayoutElement) {
    Clay_Context* context = Clay_GetCurrentContext();
    Clay_LayoutElement *parentElement = Clay_LayoutElementArray_Get(&context->layoutElements, Clay__int32_tArray_GetValue(&context->openLayoutElementStack, context->openLayoutElementStack.length - 2));
-    Clay_ElementId elementId = Clay__HashNumber(parentElement->childrenOrTextContent.children.length, parentElement->id);
+    uint32_t offset = parentElement->childrenOrTextContent.children.length + parentElement->floatingChildrenCount;
+    Clay_ElementId elementId = Clay__HashNumber(offset, parentElement->id);
    openLayoutElement->id = elementId.id;
    Clay__AddHashMapItem(elementId, openLayoutElement);
    Clay__StringArray_Add(&context->layoutElementIdStrings, elementId.stringId);
@ -1917,9 +1919,15 @@ void Clay__CloseElement(void) {

    // Close the currently open element
    int32_t closingElementIndex = Clay__int32_tArray_RemoveSwapback(&context->openLayoutElementStack, (int)context->openLayoutElementStack.length - 1);
+
+    // Get the currently open parent
    openLayoutElement = Clay__GetOpenLayoutElement();

-    if (!elementIsFloating && context->openLayoutElementStack.length > 1) {
+    if (context->openLayoutElementStack.length > 1) {
+        if(elementIsFloating) {
+            openLayoutElement->floatingChildrenCount++;
+            return;
+        }
        openLayoutElement->childrenOrTextContent.children.length++;
        Clay__int32_tArray_Add(&context->layoutElementChildrenBuffer, closingElementIndex);
    }
--- a/examples/termbox2-image-demo/CMakeLists.txt
+++ b/examples/termbox2-image-demo/CMakeLists.txt
@ -10,7 +10,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
 )
@ -19,7 +19,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
 )
Author	SHA1	Message	Date
Víctor López	445b58376c	Merge `727352a548` into `588b93196c`	2025-10-02 08:37:23 +02:00
Daniel Mayovskiy	588b93196c	[Renderers/termbox] Fixing termbox2-image-demo build error (#524 ) Some checks failed CMake on multiple platforms / build (Release, cl, cl, windows-latest) (push) Has been cancelled Details CMake on multiple platforms / build (Release, clang, clang++, ubuntu-latest) (push) Has been cancelled Details CMake on multiple platforms / build (Release, gcc, g++, ubuntu-latest) (push) Has been cancelled Details Odin Bindings Update / check_changes (push) Has been cancelled Details Odin Bindings Update / build (macos-latest) (push) Has been cancelled Details Odin Bindings Update / build (ubuntu-latest) (push) Has been cancelled Details Odin Bindings Update / commit (push) Has been cancelled Details	2025-10-02 11:21:11 +10:00
github-actions[bot]	382dcde89d	[bindings/odin] Update Odin bindings	2025-10-02 01:17:05 +00:00
elmfrain	c6442bd192	[Bug Fix] Multiple Floating Elements Cannot Use `Clay_Hovered()` (#461 ) Co-authored-by: Nic Barker <contact+github@nicbarker.com>	2025-10-02 11:14:17 +10:00