Superminaren
/
pebble
mirror of https://github.com/google/pebble
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 4adae55d98 into 4051c5bb97

This commit is contained in:
anonymou0719 2026-01-19 11:40:04 +00:00 committed by GitHub
parent 4051c5bb97 4adae55d98
commit 73808ae884
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/fw/applib/graphics/text_layout.c
View File

@ -469,7 +469,7 @@ void update_dimensions_char_visitor_cb(GContext* ctx, const TextBoxParams* const
line->width_px = (cursor.origin.x + glyph_width_px) - line->origin.x; line->width_px = (cursor.origin.x + glyph_width_px) - line->origin.x;
PBL_ASSERT(line->width_px <= text_box_params->box.size.w, PBL_ASSERT(line->width_px <= text_box_params->box.size.w,
"Line <%p>: max extent=<%u> exceeds text_box_params width=<%u>", "Line <%p>: max extent=<%" PRId16 "> exceeds text_box_params width=<%" PRId16 ">",
line, line->width_px + line->origin.x, text_box_params->box.size.w); line, line->width_px + line->origin.x, text_box_params->box.size.w);
} }
@ -494,7 +494,7 @@ utf8_t* walk_line(GContext* ctx, Line* line, const TextBoxParams* const text_box
} }
PBL_ASSERT(line->width_px <= text_box_params->box.size.w, PBL_ASSERT(line->width_px <= text_box_params->box.size.w,
"Line <%p>: max extent=<%u> exceeds text_box_params width=<%u>", line, "Line <%p>: max extent=<%" PRId16 "> exceeds text_box_params width=<%" PRId16 ">", line,
line->width_px + line->origin.x, text_box_params->box.size.w); line->width_px + line->origin.x, text_box_params->box.size.w);
int suffix_width_px = 0; int suffix_width_px = 0;