TheZone/clay
1
0
Fork 0
mirror of https://github.com/nicbarker/clay.git synced 2025-04-23 22:58:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compare commits

base: TheZone:016cc31d577e52355187fd64a47031abd2863fdb
Branches Tags
TheZone:main
TheZone:014-single-char-hash
TheZone:014-clip-config
TheZone:experimental-render-command-tree-depth
TheZone:014-simd-hash
TheZone:013-config-refactor
TheZone:013-tst-branch
TheZone:013-add-text-contents-hash-option
TheZone:013-arena-align-cache-line
TheZone:013-measure-text-string-slice
TheZone:013-expose-bounding-boxes
TheZone:013-split-padding-values
TheZone:013-fix-newline-handling
TheZone:v0.13
TheZone:v0.12
TheZone:v0.11
TheZone:v0.10
..
compare: TheZone:0c1ddd64e7b51dbea22ef10f782ba482e74d9d9f
Branches Tags
TheZone:main
TheZone:014-single-char-hash
TheZone:014-clip-config
TheZone:experimental-render-command-tree-depth
TheZone:014-simd-hash
TheZone:013-config-refactor
TheZone:013-tst-branch
TheZone:013-add-text-contents-hash-option
TheZone:013-arena-align-cache-line
TheZone:013-measure-text-string-slice
TheZone:013-expose-bounding-boxes
TheZone:013-split-padding-values
TheZone:013-fix-newline-handling
TheZone:v0.13
TheZone:v0.12
TheZone:v0.11
TheZone:v0.10

4 Commits
016cc31d57 ... 0c1ddd64e7

Author SHA1 Message Date
caleb-snow-cbm
0c1ddd64e7
Merge 94a3d57236 into 08e4c5b198 2025-03-26 11:03:53 +00:00
Nic Barker
08e4c5b198 [Core] Fix a bug where ID aliases werent copied on hash collision
Some checks are pending
CMake on multiple platforms / build (Release, cl, cl, windows-latest) (push) Waiting to run
Details
CMake on multiple platforms / build (Release, clang, clang++, ubuntu-latest) (push) Waiting to run
Details
CMake on multiple platforms / build (Release, gcc, g++, ubuntu-latest) (push) Waiting to run
Details
2025-03-26 09:35:15 +13:00
ellie-but-backwards
b1c72a0647
[Bindings/Odin] Remove field hashStringContents in odin bindings (#350) 2025-03-26 09:21:35 +13:00
Igor Karatayev
aee4baee1c
[Core] Guard against hashmap item null dereference (#338) 2025-03-26 09:19:50 +13:00
2 changed files with 4 additions and 4 deletions
Show Stats Expand all files Collapse all files

1
bindings/odin/clay-odin/clay.odin
View File

@ -111,7 +111,6 @@ TextElementConfig :: struct {
lineHeight: u16, lineHeight: u16,
wrapMode: TextWrapMode, wrapMode: TextWrapMode,
textAlignment: TextAlignment, textAlignment: TextAlignment,
hashStringContents: bool,
} }
ImageElementConfig :: struct { ImageElementConfig :: struct {

7
clay.h
View File

@ -1673,6 +1673,7 @@ Clay_LayoutElementHashMapItem* Clay__AddHashMapItem(Clay_ElementId elementId, Cl
item.nextIndex = hashItem->nextIndex; item.nextIndex = hashItem->nextIndex;
if (hashItem->generation <= context->generation) { // First collision - assume this is the "same" element if (hashItem->generation <= context->generation) { // First collision - assume this is the "same" element
hashItem->elementId = elementId; // Make sure to copy this across. If the stringId reference has changed, we should update the hash item to use the new one. hashItem->elementId = elementId; // Make sure to copy this across. If the stringId reference has changed, we should update the hash item to use the new one.
hashItem->idAlias = idAlias;
hashItem->generation = context->generation + 1; hashItem->generation = context->generation + 1;
hashItem->layoutElement = layoutElement; hashItem->layoutElement = layoutElement;
hashItem->debugData->collision = false; hashItem->debugData->collision = false;
@ -3813,10 +3814,10 @@ void Clay_SetPointerStateEx(Clay_Vector2 position, bool isPointerDown, bool isRi
Clay_LayoutElementHashMapItem *mapItem = Clay__GetHashMapItem(currentElement->id); // TODO think of a way around this, maybe the fact that it's essentially a binary tree limits the cost, but the worst case is not great Clay_LayoutElementHashMapItem *mapItem = Clay__GetHashMapItem(currentElement->id); // TODO think of a way around this, maybe the fact that it's essentially a binary tree limits the cost, but the worst case is not great
int32_t clipElementId = Clay__int32_tArray_GetValue(&context->layoutElementClipElementIds, (int32_t)(currentElement - context->layoutElements.internalArray)); int32_t clipElementId = Clay__int32_tArray_GetValue(&context->layoutElementClipElementIds, (int32_t)(currentElement - context->layoutElements.internalArray));
Clay_LayoutElementHashMapItem *clipItem = Clay__GetHashMapItem(clipElementId); Clay_LayoutElementHashMapItem *clipItem = Clay__GetHashMapItem(clipElementId);
Clay_BoundingBox elementBox = mapItem->boundingBox;
elementBox.x -= root->pointerOffset.x;
elementBox.y -= root->pointerOffset.y;
if (mapItem) { if (mapItem) {
Clay_BoundingBox elementBox = mapItem->boundingBox;
elementBox.x -= root->pointerOffset.x;
elementBox.y -= root->pointerOffset.y;
if ((Clay__PointIsInsideRect(position, elementBox)) && (clipElementId == 0 || (Clay__PointIsInsideRect(position, clipItem->boundingBox)))) { if ((Clay__PointIsInsideRect(position, elementBox)) && (clipElementId == 0 || (Clay__PointIsInsideRect(position, clipItem->boundingBox)))) {
if (mapItem->onHoverFunction) { if (mapItem->onHoverFunction) {
mapItem->onHoverFunction(mapItem->elementId, context->pointerInfo, mapItem->hoverFunctionUserData); mapItem->onHoverFunction(mapItem->elementId, context->pointerInfo, mapItem->hoverFunctionUserData);