Mirrors/clay
1
0
Fork 0
mirror of https://github.com/nicbarker/clay.git synced 2026-02-06 12:48:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 4ecba0c61a into 76ec3632d8

Browse source
This commit is contained in:
Luke 10X 2026-01-21 06:09:00 -05:00 • committed by GitHub
commit 728d0a8336
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

18
examples/GLES3-SDL2-sidebar-scrolling-container/main.c
View file

@ -225,6 +225,7 @@ void RenderDropdownTextItem(int index)
const uint32_t FONT_ID_BODY_24 = 1;
Clay_String profileText = CLAY_STRING_CONST("Profile Page one two three four five six seven eight nine ten eleven twelve thirteen fourteen fifteen");
Clay_String rightAlignedText = CLAY_STRING_CONST("Right aligned text in various fonts");
void RenderHeaderButton1(Clay_String text)
{
@ -350,6 +351,23 @@ Clay_RenderCommandArray CreateLayout(void)
CLAY(CLAY_ID("Picture6.5"), {.layout = {.sizing = {.width = CLAY_SIZING_FIXED(100), .height = CLAY_SIZING_FIXED(120)}}, .image = {.imageData = &g_window4}}) {}
}
// To test that fonts are spaced well and using their appropriate data for the width function put 2 titles side by side
// Align them to the right to make it immediately obvious if sizing is not matching the font config
CLAY(CLAY_ID("RightAlignedBlock"), {.layout = {.layoutDirection = CLAY_TOP_TO_BOTTOM, .sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_GROW(0)}, .childGap = 16, .padding = {16, 16, 16, 16}}, .backgroundColor = {180, 180, 220, (float)(Clay_Hovered() ? 120 : 255)}})
{
CLAY(CLAY_ID("RightText1"), {.layout = {.layoutDirection = CLAY_LEFT_TO_RIGHT, .sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_GROW(0)}}, .backgroundColor = {180, 180, 220, 255}})
{
CLAY(CLAY_ID("RightText1Spacer"), {.layout = {.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_GROW(0)}},}) {}
CLAY_TEXT(rightAlignedText, CLAY_TEXT_CONFIG({.fontSize = 24, .textColor = {0, 0, 0, 255}, .textAlignment = CLAY_TEXT_ALIGN_RIGHT}));
}
CLAY(CLAY_ID("RightText2"), {.layout = {.layoutDirection = CLAY_LEFT_TO_RIGHT, .sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_GROW(0)}}, .backgroundColor = {180, 180, 220, 255}})
{
CLAY(CLAY_ID("RightText2Spacer"), {.layout = {.sizing = {.width = CLAY_SIZING_GROW(0), .height = CLAY_SIZING_GROW(0)}},}) {}
CLAY_TEXT(rightAlignedText, CLAY_TEXT_CONFIG({.fontId = FONT_ID_BODY_24, .fontSize = 24, .textColor = {0, 0, 0, 255}, .textAlignment = CLAY_TEXT_ALIGN_RIGHT}));
}
}
Clay_String cs = {.isStaticallyAllocated = false, .length = g_glInfoTextLen, .chars = g_glInfoText};
Clay_TextElementConfig glInfoElementConfig = {.fontId = FONT_ID_BODY_24, .fontSize = 24, .textColor = {255, 255, 255, 255}};
CLAY_TEXT(cs, &glInfoElementConfig);

4
renderers/GLES3/clay_renderer_gles3_loader_stb.c
View file

@ -188,7 +188,9 @@ static inline Clay_Dimensions Stb_MeasureText(
Clay_TextElementConfig *config,
void *userData)
{
Stb_FontData *fontData = (Stb_FontData *)userData;
// Use fontData of specified font
Stb_FontData *allFontData = (Stb_FontData *)userData;
Stb_FontData *fontData = &allFontData[config->fontId];
if (!fontData->cdata)
{