mirror of
https://github.com/nicbarker/clay.git
synced 2025-04-19 04:38:01 +00:00
Normalized usage of Clay__defaultMaxElementCount and Clay__defaultMaxMeasureTextWordCacheCount
Normalized usage of Clay__defaultMaxElementCount and Clay__defaultMaxMeasureTextWordCacheCount; especially between calls to Clay_MinMemorySize() and Clay_Initialize() as there is a bug that prevents initializing when the non-default value is used.
This commit is contained in:
parent
951d785deb
commit
fc265f9c0e
3
clay.h
3
clay.h
@ -3773,7 +3773,7 @@ Clay_Context* Clay_Initialize(Clay_Arena arena, Clay_Dimensions layoutDimensions
|
|||||||
Clay_Context *oldContext = Clay_GetCurrentContext();
|
Clay_Context *oldContext = Clay_GetCurrentContext();
|
||||||
*context = CLAY__INIT(Clay_Context) {
|
*context = CLAY__INIT(Clay_Context) {
|
||||||
.maxElementCount = oldContext ? oldContext->maxElementCount : Clay__defaultMaxElementCount,
|
.maxElementCount = oldContext ? oldContext->maxElementCount : Clay__defaultMaxElementCount,
|
||||||
.maxMeasureTextCacheWordCount = oldContext ? oldContext->maxMeasureTextCacheWordCount : Clay__defaultMaxElementCount * 2,
|
.maxMeasureTextCacheWordCount = oldContext ? oldContext->maxMeasureTextCacheWordCount : Clay__defaultMaxMeasureTextWordCacheCount,
|
||||||
.errorHandler = errorHandler.errorHandlerFunction ? errorHandler : CLAY__INIT(Clay_ErrorHandler) { Clay__ErrorHandlerFunctionDefault },
|
.errorHandler = errorHandler.errorHandlerFunction ? errorHandler : CLAY__INIT(Clay_ErrorHandler) { Clay__ErrorHandlerFunctionDefault },
|
||||||
.layoutDimensions = layoutDimensions,
|
.layoutDimensions = layoutDimensions,
|
||||||
.internalArena = arena,
|
.internalArena = arena,
|
||||||
@ -4077,6 +4077,7 @@ void Clay_SetMaxElementCount(int32_t maxElementCount) {
|
|||||||
context->maxElementCount = maxElementCount;
|
context->maxElementCount = maxElementCount;
|
||||||
} else {
|
} else {
|
||||||
Clay__defaultMaxElementCount = maxElementCount; // TODO: Fix this
|
Clay__defaultMaxElementCount = maxElementCount; // TODO: Fix this
|
||||||
|
Clay__defaultMaxMeasureTextWordCacheCount = maxElementCount * 2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user