From 25acf1a5dd778aa82a828a2138bf33af20fb81dc Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Wed, 14 Dec 2022 17:30:27 +0000 Subject: html: layout: flex: Rename indirected box w/h functions --- content/handlers/html/layout_flex.c | 8 +++++--- content/handlers/html/layout_internal.h | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'content/handlers') diff --git a/content/handlers/html/layout_flex.c b/content/handlers/html/layout_flex.c index 40e10632b..65f770ffa 100644 --- a/content/handlers/html/layout_flex.c +++ b/content/handlers/html/layout_flex.c @@ -773,8 +773,10 @@ static bool layout_flex__place_line_items_main( int *box_size_main; int *box_size_cross; - box_size_main = lh__box_size_main(ctx->horizontal, b); - box_size_cross = lh__box_size_cross(ctx->horizontal, b); + box_size_main = lh__box_size_main_ptr( + ctx->horizontal, b); + box_size_cross = lh__box_size_cross_ptr( + ctx->horizontal, b); main_pos += *box_size_main + lh__delta_outer_main( ctx->flex, b); @@ -854,7 +856,7 @@ static void layout_flex__place_line_items_cross(struct flex_ctx *ctx, int *box_pos_cross; box_pos_cross = ctx->horizontal ? &b->y : &b->x; - box_size_cross = lh__box_size_cross(ctx->horizontal, b); + box_size_cross = lh__box_size_cross_ptr(ctx->horizontal, b); cross_free_space = line->cross_size + extra - *box_size_cross - lh__delta_outer_cross(ctx->flex, b); diff --git a/content/handlers/html/layout_internal.h b/content/handlers/html/layout_internal.h index c6eb56d6e..736778933 100644 --- a/content/handlers/html/layout_internal.h +++ b/content/handlers/html/layout_internal.h @@ -244,14 +244,14 @@ static inline int lh__delta_outer_cross( } } -static inline int *lh__box_size_main( +static inline int *lh__box_size_main_ptr( bool horizontal, struct box *b) { return horizontal ? &b->width : &b->height; } -static inline int *lh__box_size_cross( +static inline int *lh__box_size_cross_ptr( bool horizontal, struct box *b) { -- cgit v1.2.3