TheZone/clay
1
0
Fork 0
mirror of https://github.com/nicbarker/clay.git synced 2025-04-22 06:08:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Compare commits

base: TheZone:e998c16bb61293876a3c2efe559c2d0538c76a46
Branches Tags
TheZone:main
TheZone:014-single-char-hash
TheZone:014-clip-config
TheZone:experimental-render-command-tree-depth
TheZone:014-simd-hash
TheZone:013-config-refactor
TheZone:013-tst-branch
TheZone:013-add-text-contents-hash-option
TheZone:013-arena-align-cache-line
TheZone:013-measure-text-string-slice
TheZone:013-expose-bounding-boxes
TheZone:013-split-padding-values
TheZone:013-fix-newline-handling
TheZone:v0.13
TheZone:v0.12
TheZone:v0.11
TheZone:v0.10
...
compare: TheZone:4359b458e7dc2f40894fdf9d3a3a8d426ab9b292
Branches Tags
TheZone:main
TheZone:014-single-char-hash
TheZone:014-clip-config
TheZone:experimental-render-command-tree-depth
TheZone:014-simd-hash
TheZone:013-config-refactor
TheZone:013-tst-branch
TheZone:013-add-text-contents-hash-option
TheZone:013-arena-align-cache-line
TheZone:013-measure-text-string-slice
TheZone:013-expose-bounding-boxes
TheZone:013-split-padding-values
TheZone:013-fix-newline-handling
TheZone:v0.13
TheZone:v0.12
TheZone:v0.11
TheZone:v0.10

2 Commits
e998c16bb6 ... 4359b458e7

Author SHA1 Message Date
Piggybank Studios
4359b458e7
Merge fbf8251996 into 1204ac400b 2025-03-28 19:12:05 +07:00
Taylor Robbins (Piggybank Studios)
fbf8251996 Adds CLAY_TEXT_ALIGN_SHRINK option to Clay_TextAlignment which tells the TEXT command producing code it is allowed to pass a boundingBox that is horizontally smaller than the result of the MeasureText call for that string. The Renderer is then able to choose how it wants to fit a piece of text in a smaller space (often this involves removing some number of characters and replacing them with "..." characters) 2025-03-05 13:04:57 -08:00
1 changed files with 13 additions and 1 deletions
Show Stats Expand all files Collapse all files

14
clay.h
View File

@ -360,6 +360,8 @@ typedef CLAY_PACKED_ENUM {
CLAY_TEXT_ALIGN_CENTER, CLAY_TEXT_ALIGN_CENTER,
// Horizontally aligns wrapped lines of text to the right hand side of their bounding box. // Horizontally aligns wrapped lines of text to the right hand side of their bounding box.
CLAY_TEXT_ALIGN_RIGHT, CLAY_TEXT_ALIGN_RIGHT,
// The boundingBox passed to the TEXT render command may be smaller than the measured text size. The renderer must then decide how to shorten the text to make it fit
CLAY_TEXT_ALIGN_SHRINK,
} Clay_TextAlignment; } Clay_TextAlignment;
// Controls various functionality related to text elements. // Controls various functionality related to text elements.
@ -2805,14 +2807,24 @@ void Clay__CalculateFinalLayout(void) {
continue; continue;
} }
float offset = (currentElementBoundingBox.width - wrappedLine->dimensions.width); float offset = (currentElementBoundingBox.width - wrappedLine->dimensions.width);
if (textElementConfig->textAlignment == CLAY_TEXT_ALIGN_LEFT) { if (textElementConfig->textAlignment == CLAY_TEXT_ALIGN_LEFT || textElementConfig->textAlignment == CLAY_TEXT_ALIGN_SHRINK) {
offset = 0; offset = 0;
} }
if (textElementConfig->textAlignment == CLAY_TEXT_ALIGN_CENTER) { if (textElementConfig->textAlignment == CLAY_TEXT_ALIGN_CENTER) {
offset /= 2; offset /= 2;
} }
Clay_BoundingBox textBoundingBox = {
currentElementBoundingBox.x + offset,
currentElementBoundingBox.y + yPosition,
wrappedLine->dimensions.width,
wrappedLine->dimensions.height
};
if (textElementConfig->textAlignment == CLAY_TEXT_ALIGN_SHRINK && boundingBox.width > currentElementBoundingBox.width) {
boundingBox.width = currentElementBoundingBox.width;
}
Clay__AddRenderCommand(CLAY__INIT(Clay_RenderCommand) { Clay__AddRenderCommand(CLAY__INIT(Clay_RenderCommand) {
.boundingBox = { currentElementBoundingBox.x + offset, currentElementBoundingBox.y + yPosition, wrappedLine->dimensions.width, wrappedLine->dimensions.height }, .boundingBox = { currentElementBoundingBox.x + offset, currentElementBoundingBox.y + yPosition, wrappedLine->dimensions.width, wrappedLine->dimensions.height },
.boundingBox = textBoundingBox,
.renderData = { .text = { .renderData = { .text = {
.stringContents = CLAY__INIT(Clay_StringSlice) { .length = wrappedLine->line.length, .chars = wrappedLine->line.chars, .baseChars = currentElement->childrenOrTextContent.textElementData->text.chars }, .stringContents = CLAY__INIT(Clay_StringSlice) { .length = wrappedLine->line.length, .chars = wrappedLine->line.chars, .baseChars = currentElement->childrenOrTextContent.textElementData->text.chars },
.textColor = textElementConfig->textColor, .textColor = textElementConfig->textColor,