Sara/clay
1
0
Fork 0
mirror of https://github.com/nicbarker/clay.git synced 2025-09-18 04:26:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Renderers/Cairo] Fix cairo renderer and example (#416)

Browse source
This commit is contained in:
Zordan 2025-05-19 02:36:08 +03:00 committed by GitHub
parent 76351a0999
commit eb1d85f2a6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/cairo-pdf-rendering/main.c
View file

@ -145,7 +145,7 @@ int main(void) {
"Quicksand Semibold" "Quicksand Semibold"
}; };
Clay_SetMeasureTextFunction(Clay_Cairo_MeasureText, (uintptr_t)fonts); Clay_SetMeasureTextFunction(Clay_Cairo_MeasureText, fonts);
Clay_BeginLayout(); Clay_BeginLayout();

6
renderers/cairo/clay_renderer_cairo.c
View file

@ -75,7 +75,7 @@ static inline char *Clay_Cairo__NullTerminate(Clay_String *str) {
} }
// Measure text using cairo's *toy* text API. // Measure text using cairo's *toy* text API.
static inline Clay_Dimensions Clay_Cairo_MeasureText(Clay_StringSlice str, Clay_TextElementConfig *config, uintptr_t userData) { static inline Clay_Dimensions Clay_Cairo_MeasureText(Clay_StringSlice str, Clay_TextElementConfig *config, void *userData) {
// Edge case: Clay computes the width of a whitespace character // Edge case: Clay computes the width of a whitespace character
// once. Cairo does not factor in whitespaces when computing text // once. Cairo does not factor in whitespaces when computing text
// extents, this edge-case serves as a short-circuit to introduce // extents, this edge-case serves as a short-circuit to introduce
@ -95,7 +95,7 @@ static inline Clay_Dimensions Clay_Cairo_MeasureText(Clay_StringSlice str, Clay_
} }
// Ensure string is null-terminated for Cairo // Ensure string is null-terminated for Cairo
Clay_String toTerminate = (Clay_String){ str.length, str.chars }; Clay_String toTerminate = (Clay_String){ .chars = str.chars, .length = str.length, .isStaticallyAllocated = false };
char *text = Clay_Cairo__NullTerminate(&toTerminate); char *text = Clay_Cairo__NullTerminate(&toTerminate);
char *font_family = fonts[config->fontId]; char *font_family = fonts[config->fontId];
@ -220,7 +220,7 @@ void Clay_Cairo_Render(Clay_RenderCommandArray commands, char** fonts) {
// Cairo expects null terminated strings, we need to clone // Cairo expects null terminated strings, we need to clone
// to temporarily introduce one. // to temporarily introduce one.
Clay_TextRenderData *config = &command->renderData.text; Clay_TextRenderData *config = &command->renderData.text;
Clay_String toTerminate = (Clay_String){ config->stringContents.length, config->stringContents.chars }; Clay_String toTerminate = (Clay_String){ .chars = config->stringContents.chars, .length = config->stringContents.length, .isStaticallyAllocated = false };
char *text = Clay_Cairo__NullTerminate(&toTerminate); char *text = Clay_Cairo__NullTerminate(&toTerminate);
char *font_family = fonts[config->fontId]; char *font_family = fonts[config->fontId];