mirror of
https://github.com/nicbarker/clay.git
synced 2025-11-08 05:38:30 +00:00
Compare commits
No commits in common. "588b93196cc7a182a024a9ef08ba8e352904a1bd" and "7874cdb085afedece20e30348e812944a5281706" have entirely different histories.
588b93196c
...
7874cdb085
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
12
clay.h
12
clay.h
|
|
@ -1146,7 +1146,6 @@ typedef struct {
|
|||
Clay_LayoutConfig *layoutConfig;
|
||||
Clay__ElementConfigArraySlice elementConfigs;
|
||||
uint32_t id;
|
||||
uint16_t floatingChildrenCount;
|
||||
} Clay_LayoutElement;
|
||||
|
||||
CLAY__ARRAY_DEFINE(Clay_LayoutElement, Clay_LayoutElementArray)
|
||||
|
|
@ -1777,8 +1776,7 @@ 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));
|
||||
uint32_t offset = parentElement->childrenOrTextContent.children.length + parentElement->floatingChildrenCount;
|
||||
Clay_ElementId elementId = Clay__HashNumber(offset, parentElement->id);
|
||||
Clay_ElementId elementId = Clay__HashNumber(parentElement->childrenOrTextContent.children.length, parentElement->id);
|
||||
openLayoutElement->id = elementId.id;
|
||||
Clay__AddHashMapItem(elementId, openLayoutElement);
|
||||
Clay__StringArray_Add(&context->layoutElementIdStrings, elementId.stringId);
|
||||
|
|
@ -1919,15 +1917,9 @@ 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 (context->openLayoutElementStack.length > 1) {
|
||||
if(elementIsFloating) {
|
||||
openLayoutElement->floatingChildrenCount++;
|
||||
return;
|
||||
}
|
||||
if (!elementIsFloating && context->openLayoutElementStack.length > 1) {
|
||||
openLayoutElement->childrenOrTextContent.children.length++;
|
||||
Clay__int32_tArray_Add(&context->layoutElementChildrenBuffer, closingElementIndex);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ set(FETCHCONTENT_QUIET FALSE)
|
|||
FetchContent_Declare(
|
||||
termbox2
|
||||
GIT_REPOSITORY "https://github.com/termbox/termbox2.git"
|
||||
GIT_TAG "ffd159c2a6106dd5eef338a6702ad15d4d4aa809"
|
||||
GIT_TAG "9c9281a9a4c971a2be57f8645e828ec99fd555e8"
|
||||
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 "fede005abaf93d9d7f3a679d1999b2db341b360f"
|
||||
GIT_TAG "f58f558c120e9b32c217290b80bad1a0729fbb2c"
|
||||
GIT_PROGRESS TRUE
|
||||
GIT_SHALLOW TRUE
|
||||
)
|
||||
|
|
|
|||
Loading…
Reference in a new issue