From e9dc187f1ab50d1b8b16d6933165fc0cfc0c54f0 Mon Sep 17 00:00:00 2001 From: Nic Barker Date: Wed, 9 Oct 2024 19:13:03 +1300 Subject: [PATCH] c++ compiler fixes --- clay.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/clay.h b/clay.h index 79cf4db..f59a214 100644 --- a/clay.h +++ b/clay.h @@ -1555,7 +1555,7 @@ Clay__MeasureTextCacheItem *Clay__MeasureTextCached(Clay_String *text, Clay_Text char current = text->chars[end]; if (current == ' ' || current == '\n') { uint32_t length = end - start; - Clay_String word = CLAY__INIT(Clay_String) { .length = length, .chars = &text->chars[start] }; + Clay_String word = CLAY__INIT(Clay_String) { .length = (int)length, .chars = &text->chars[start] }; Clay_Dimensions dimensions = Clay__MeasureText(&word, config); if (current == ' ') { dimensions.width += spaceWidth; @@ -1573,7 +1573,7 @@ Clay__MeasureTextCacheItem *Clay__MeasureTextCached(Clay_String *text, Clay_Text } end++; } - Clay_String lastWord = CLAY__INIT(Clay_String) { .length = end - start, .chars = &text->chars[start] }; + Clay_String lastWord = CLAY__INIT(Clay_String) { .length = (int)(end - start), .chars = &text->chars[start] }; Clay_Dimensions dimensions = Clay__MeasureText(&lastWord, config); Clay__MeasuredWordArray_Add(&Clay__measuredWords, CLAY__INIT(Clay__MeasuredWord) { .word = lastWord, .startOffset = start, .length = end - start, .width = dimensions.width }); measuredWidth += dimensions.width; @@ -2145,7 +2145,7 @@ void Clay__CalculateFinalLayout() { Clay__MeasuredWord *measuredWord = Clay__MeasuredWordArraySlice_Get(&measureTextCacheItem->measuredWords, wordIndex); // measuredWord->length == 0 means a newline character if (measuredWord->length == 0 || lineWidth + measuredWord->width > containerElement->dimensions.width) { - Clay__StringArray_Add(&Clay__wrappedTextLines, CLAY__INIT(Clay_String) {.length = lineLengthChars, .chars = &textElementData->text.chars[lineStartOffset] }); + Clay__StringArray_Add(&Clay__wrappedTextLines, CLAY__INIT(Clay_String) {.length = (int)lineLengthChars, .chars = &textElementData->text.chars[lineStartOffset] }); textElementData->wrappedLines.length++; if (lineLengthChars > 0 && measuredWord->length > 0) { wordIndex--; @@ -2159,7 +2159,7 @@ void Clay__CalculateFinalLayout() { } } if (lineLengthChars > 0) { - Clay__StringArray_Add(&Clay__wrappedTextLines, CLAY__INIT(Clay_String) {.length = lineLengthChars, .chars = &textElementData->text.chars[lineStartOffset] }); + Clay__StringArray_Add(&Clay__wrappedTextLines, CLAY__INIT(Clay_String) {.length = (int)lineLengthChars, .chars = &textElementData->text.chars[lineStartOffset] }); textElementData->wrappedLines.length++; } containerElement->dimensions.height = lineHeight * textElementData->wrappedLines.length;