Mirrors/clay
1
0
Fork 0
mirror of https://github.com/nicbarker/clay.git synced 2025-11-07 13:26:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compare commits

base: Mirrors:f1adbe306d50c2a07af2789b56232c9b5cc824e0
Branches Tags
Mirrors:main
Mirrors:015-id-refactor
Mirrors:015-dont-emit-scissor-oob
Mirrors:014-aspect-ratio-scaling
Mirrors:014-clip-config
Mirrors:014-single-char-hash
Mirrors:experimental-render-command-tree-depth
Mirrors:014-simd-hash
Mirrors:013-config-refactor
Mirrors:013-tst-branch
Mirrors:013-add-text-contents-hash-option
Mirrors:013-arena-align-cache-line
Mirrors:013-measure-text-string-slice
Mirrors:013-expose-bounding-boxes
Mirrors:013-split-padding-values
Mirrors:013-fix-newline-handling
Mirrors:v0.14
Mirrors:v0.13
Mirrors:v0.12
Mirrors:v0.11
Mirrors:v0.10
...
compare: Mirrors:3cdb08ae7ee9b35685f9c61248f8e7e6b76e2060
Branches Tags
Mirrors:main
Mirrors:015-id-refactor
Mirrors:015-dont-emit-scissor-oob
Mirrors:014-aspect-ratio-scaling
Mirrors:014-clip-config
Mirrors:014-single-char-hash
Mirrors:experimental-render-command-tree-depth
Mirrors:014-simd-hash
Mirrors:013-config-refactor
Mirrors:013-tst-branch
Mirrors:013-add-text-contents-hash-option
Mirrors:013-arena-align-cache-line
Mirrors:013-measure-text-string-slice
Mirrors:013-expose-bounding-boxes
Mirrors:013-split-padding-values
Mirrors:013-fix-newline-handling
Mirrors:v0.14
Mirrors:v0.13
Mirrors:v0.12
Mirrors:v0.11
Mirrors:v0.10

5 commits
f1adbe306d ... 3cdb08ae7e

Author SHA1 Message Date
godalming123 3cdb08ae7e
Merge 6e190427d8 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
godalming123 6e190427d8 Fix #77 2025-09-05 23:19:58 +01:00
10 changed files with 15 additions and 22 deletions
Show stats Expand all files Collapse all files

BIN
bindings/odin/clay-odin/linux/clay.a
View file

Binary file not shown.

BIN
bindings/odin/clay-odin/macos-arm64/clay.a
View file

Binary file not shown.

BIN
bindings/odin/clay-odin/macos/clay.a
View file

Binary file not shown.

BIN
bindings/odin/clay-odin/wasm/clay.o
View file

Binary file not shown.

BIN
bindings/odin/clay-odin/windows/clay.lib
View file

Binary file not shown.

12
clay.h
View file

@ -1146,6 +1146,7 @@ typedef struct {
Clay_LayoutConfig *layoutConfig; Clay_LayoutConfig *layoutConfig;
Clay__ElementConfigArraySlice elementConfigs; Clay__ElementConfigArraySlice elementConfigs;
uint32_t id; uint32_t id;
uint16_t floatingChildrenCount;
} Clay_LayoutElement; } Clay_LayoutElement;
CLAY__ARRAY_DEFINE(Clay_LayoutElement, Clay_LayoutElementArray) 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_ElementId Clay__GenerateIdForAnonymousElement(Clay_LayoutElement *openLayoutElement) {
Clay_Context* context = Clay_GetCurrentContext(); Clay_Context* context = Clay_GetCurrentContext();
Clay_LayoutElement *parentElement = Clay_LayoutElementArray_Get(&context->layoutElements, Clay__int32_tArray_GetValue(&context->openLayoutElementStack, context->openLayoutElementStack.length - 2)); 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; openLayoutElement->id = elementId.id;
Clay__AddHashMapItem(elementId, openLayoutElement); Clay__AddHashMapItem(elementId, openLayoutElement);
Clay__StringArray_Add(&context->layoutElementIdStrings, elementId.stringId); Clay__StringArray_Add(&context->layoutElementIdStrings, elementId.stringId);
@ -1917,9 +1919,15 @@ void Clay__CloseElement(void) {
// Close the currently open element // Close the currently open element
int32_t closingElementIndex = Clay__int32_tArray_RemoveSwapback(&context->openLayoutElementStack, (int)context->openLayoutElementStack.length - 1); int32_t closingElementIndex = Clay__int32_tArray_RemoveSwapback(&context->openLayoutElementStack, (int)context->openLayoutElementStack.length - 1);
// Get the currently open parent
openLayoutElement = Clay__GetOpenLayoutElement(); openLayoutElement = Clay__GetOpenLayoutElement();
if (!elementIsFloating && context->openLayoutElementStack.length > 1) { if (context->openLayoutElementStack.length > 1) {
if(elementIsFloating) {
openLayoutElement->floatingChildrenCount++;
return;
}
openLayoutElement->childrenOrTextContent.children.length++; openLayoutElement->childrenOrTextContent.children.length++;
Clay__int32_tArray_Add(&context->layoutElementChildrenBuffer, closingElementIndex); Clay__int32_tArray_Add(&context->layoutElementChildrenBuffer, closingElementIndex);
} }

8
examples/clay-official-website/build/clay/index.html
View file

@ -500,9 +500,6 @@
let linkContents = customData.link.length.value > 0 ? textDecoder.decode(new Uint8Array(memoryDataView.buffer.slice(customData.link.chars.value, customData.link.chars.value + customData.link.length.value))) : 0; let linkContents = customData.link.length.value > 0 ? textDecoder.decode(new Uint8Array(memoryDataView.buffer.slice(customData.link.chars.value, customData.link.chars.value + customData.link.length.value))) : 0;
memoryDataView.setUint32(0, renderCommand.id.value, true); memoryDataView.setUint32(0, renderCommand.id.value, true);
if (linkContents.length > 0 && (window.mouseDownThisFrame || window.touchDown) && instance.exports.Clay_PointerOver(0)) {
window.location.href = linkContents;
}
if (linkContents.length > 0) { if (linkContents.length > 0) {
element.href = linkContents; element.href = linkContents;
} }
@ -567,9 +564,6 @@
element.style.pointerEvents = customData.disablePointerEvents.value ? 'none' : 'all'; element.style.pointerEvents = customData.disablePointerEvents.value ? 'none' : 'all';
let linkContents = customData.link.length.value > 0 ? textDecoder.decode(new Uint8Array(memoryDataView.buffer.slice(customData.link.chars.value, customData.link.chars.value + customData.link.length.value))) : 0; let linkContents = customData.link.length.value > 0 ? textDecoder.decode(new Uint8Array(memoryDataView.buffer.slice(customData.link.chars.value, customData.link.chars.value + customData.link.length.value))) : 0;
memoryDataView.setUint32(0, renderCommand.id.value, true); memoryDataView.setUint32(0, renderCommand.id.value, true);
if (linkContents.length > 0 && (window.mouseDownThisFrame || window.touchDown) && instance.exports.Clay_PointerOver(0)) {
window.location.href = linkContents;
}
if (linkContents.length > 0) { if (linkContents.length > 0) {
element.href = linkContents; element.href = linkContents;
} }
@ -854,4 +848,4 @@
</script> </script>
<body> <body>
</body> </body>
</html> </html>

8
examples/clay-official-website/index.html
View file

@ -500,9 +500,6 @@
let linkContents = customData.link.length.value > 0 ? textDecoder.decode(new Uint8Array(memoryDataView.buffer.slice(customData.link.chars.value, customData.link.chars.value + customData.link.length.value))) : 0; let linkContents = customData.link.length.value > 0 ? textDecoder.decode(new Uint8Array(memoryDataView.buffer.slice(customData.link.chars.value, customData.link.chars.value + customData.link.length.value))) : 0;
memoryDataView.setUint32(0, renderCommand.id.value, true); memoryDataView.setUint32(0, renderCommand.id.value, true);
if (linkContents.length > 0 && (window.mouseDownThisFrame || window.touchDown) && instance.exports.Clay_PointerOver(0)) {
window.location.href = linkContents;
}
if (linkContents.length > 0) { if (linkContents.length > 0) {
element.href = linkContents; element.href = linkContents;
} }
@ -567,9 +564,6 @@
element.style.pointerEvents = customData.disablePointerEvents.value ? 'none' : 'all'; element.style.pointerEvents = customData.disablePointerEvents.value ? 'none' : 'all';
let linkContents = customData.link.length.value > 0 ? textDecoder.decode(new Uint8Array(memoryDataView.buffer.slice(customData.link.chars.value, customData.link.chars.value + customData.link.length.value))) : 0; let linkContents = customData.link.length.value > 0 ? textDecoder.decode(new Uint8Array(memoryDataView.buffer.slice(customData.link.chars.value, customData.link.chars.value + customData.link.length.value))) : 0;
memoryDataView.setUint32(0, renderCommand.id.value, true); memoryDataView.setUint32(0, renderCommand.id.value, true);
if (linkContents.length > 0 && (window.mouseDownThisFrame || window.touchDown) && instance.exports.Clay_PointerOver(0)) {
window.location.href = linkContents;
}
if (linkContents.length > 0) { if (linkContents.length > 0) {
element.href = linkContents; element.href = linkContents;
} }
@ -854,4 +848,4 @@
</script> </script>
<body> <body>
</body> </body>
</html> </html>

4
examples/termbox2-image-demo/CMakeLists.txt
View file

@ -10,7 +10,7 @@ set(FETCHCONTENT_QUIET FALSE)
FetchContent_Declare( FetchContent_Declare(
termbox2 termbox2
GIT_REPOSITORY "https://github.com/termbox/termbox2.git" GIT_REPOSITORY "https://github.com/termbox/termbox2.git"
GIT_TAG "9c9281a9a4c971a2be57f8645e828ec99fd555e8" GIT_TAG "ffd159c2a6106dd5eef338a6702ad15d4d4aa809"
GIT_PROGRESS TRUE GIT_PROGRESS TRUE
GIT_SHALLOW TRUE GIT_SHALLOW TRUE
) )
@ -19,7 +19,7 @@ FetchContent_MakeAvailable(termbox2)
FetchContent_Declare( FetchContent_Declare(
stb stb
GIT_REPOSITORY "https://github.com/nothings/stb.git" GIT_REPOSITORY "https://github.com/nothings/stb.git"
GIT_TAG "f58f558c120e9b32c217290b80bad1a0729fbb2c" GIT_TAG "fede005abaf93d9d7f3a679d1999b2db341b360f"
GIT_PROGRESS TRUE GIT_PROGRESS TRUE
GIT_SHALLOW TRUE GIT_SHALLOW TRUE
) )

5
renderers/web/html/clay-html-renderer.html
View file

@ -394,9 +394,6 @@
let configMemory = new Uint8Array(memoryDataView.buffer.slice(renderCommand.config.value, renderCommand.config.value + config.__size)); let configMemory = new Uint8Array(memoryDataView.buffer.slice(renderCommand.config.value, renderCommand.config.value + config.__size));
let linkContents = config.link.length.value > 0 ? textDecoder.decode(new Uint8Array(memoryDataView.buffer.slice(config.link.chars.value, config.link.chars.value + config.link.length.value))) : 0; let linkContents = config.link.length.value > 0 ? textDecoder.decode(new Uint8Array(memoryDataView.buffer.slice(config.link.chars.value, config.link.chars.value + config.link.length.value))) : 0;
memoryDataView.setUint32(0, renderCommand.id.value, true); memoryDataView.setUint32(0, renderCommand.id.value, true);
if (linkContents.length > 0 && (window.mouseDownThisFrame || window.touchDown) && instance.exports.Clay_PointerOver(0)) {
window.location.href = linkContents;
}
if (!dirty && !MemoryIsDifferent(configMemory, elementData.previousMemoryConfig, config.__size)) { if (!dirty && !MemoryIsDifferent(configMemory, elementData.previousMemoryConfig, config.__size)) {
break; break;
} }
@ -528,4 +525,4 @@
<body> <body>
</body> </body>
</html> </html>