Mirrors/clay
1
0
Fork 0
mirror of https://github.com/nicbarker/clay.git synced 2025-12-24 10:01:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Core] fix scroll jump on layout change by comparing IDs instead of pointers

Browse source
This commit is contained in:
Jipok 2025-11-28 01:46:45 +05:00
parent 2749e56e7e
commit 1abbd77bd8
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
clay.h
View file

@ -2785,7 +2785,7 @@ void Clay__CalculateFinalLayout(void) {
// This linear scan could theoretically be slow under very strange conditions, but I can't imagine a real UI with more than a few 10's of scroll containers // This linear scan could theoretically be slow under very strange conditions, but I can't imagine a real UI with more than a few 10's of scroll containers
for (int32_t i = 0; i < context->scrollContainerDatas.length; i++) { for (int32_t i = 0; i < context->scrollContainerDatas.length; i++) {
Clay__ScrollContainerDataInternal *mapping = Clay__ScrollContainerDataInternalArray_Get(&context->scrollContainerDatas, i); Clay__ScrollContainerDataInternal *mapping = Clay__ScrollContainerDataInternalArray_Get(&context->scrollContainerDatas, i);
if (mapping->layoutElement == currentElement) { if (mapping->elementId == currentElement->id) {
scrollContainerData = mapping; scrollContainerData = mapping;
mapping->boundingBox = currentElementBoundingBox; mapping->boundingBox = currentElementBoundingBox;
scrollOffset = clipConfig->childOffset; scrollOffset = clipConfig->childOffset;
@ -3005,7 +3005,7 @@ void Clay__CalculateFinalLayout(void) {
closeClipElement = true; closeClipElement = true;
for (int32_t i = 0; i < context->scrollContainerDatas.length; i++) { for (int32_t i = 0; i < context->scrollContainerDatas.length; i++) {
Clay__ScrollContainerDataInternal *mapping = Clay__ScrollContainerDataInternalArray_Get(&context->scrollContainerDatas, i); Clay__ScrollContainerDataInternal *mapping = Clay__ScrollContainerDataInternalArray_Get(&context->scrollContainerDatas, i);
if (mapping->layoutElement == currentElement) { if (mapping->elementId == currentElement->id) {
scrollOffset = clipConfig->childOffset; scrollOffset = clipConfig->childOffset;
if (context->externalScrollHandlingEnabled) { if (context->externalScrollHandlingEnabled) {
scrollOffset = CLAY__INIT(Clay_Vector2) CLAY__DEFAULT_STRUCT; scrollOffset = CLAY__INIT(Clay_Vector2) CLAY__DEFAULT_STRUCT;
@ -4091,7 +4091,7 @@ Clay_Vector2 Clay_GetScrollOffset(void) {
} }
for (int32_t i = 0; i < context->scrollContainerDatas.length; i++) { for (int32_t i = 0; i < context->scrollContainerDatas.length; i++) {
Clay__ScrollContainerDataInternal *mapping = Clay__ScrollContainerDataInternalArray_Get(&context->scrollContainerDatas, i); Clay__ScrollContainerDataInternal *mapping = Clay__ScrollContainerDataInternalArray_Get(&context->scrollContainerDatas, i);
if (mapping->layoutElement == openLayoutElement) { if (mapping->elementId == openLayoutElement->id) {
return mapping->scrollPosition; return mapping->scrollPosition;
} }
} }