From 7d833537aaefe179760db7aab10720a24357410d Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Sat, 29 Oct 2022 17:13:04 +0100 Subject: css: Update display property helper for grid --- content/handlers/css/utils.h | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/content/handlers/css/utils.h b/content/handlers/css/utils.h index 541677a3a..0b053745d 100644 --- a/content/handlers/css/utils.h +++ b/content/handlers/css/utils.h @@ -28,35 +28,49 @@ extern css_fixed nscss_screen_dpi; /** * Temporary helper wrappers for for libcss computed style getter, while - * we don't support flexbox related property values. + * we don't support all values of display. */ - static inline uint8_t ns_computed_display( const css_computed_style *style, bool root) { uint8_t value = css_computed_display(style, root); - if (value == CSS_DISPLAY_FLEX) { + switch (value) { + case CSS_DISPLAY_FLEX: + case CSS_DISPLAY_GRID: return CSS_DISPLAY_BLOCK; - } else if (value == CSS_DISPLAY_INLINE_FLEX) { + case CSS_DISPLAY_INLINE_FLEX: + case CSS_DISPLAY_INLINE_GRID: return CSS_DISPLAY_INLINE_BLOCK; + + default: + break; } return value; } - +/** + * Temporary helper wrappers for for libcss computed style getter, while + * we don't support all values of display. + */ static inline uint8_t ns_computed_display_static( const css_computed_style *style) { uint8_t value = css_computed_display_static(style); - if (value == CSS_DISPLAY_FLEX) { + switch (value) { + case CSS_DISPLAY_FLEX: + case CSS_DISPLAY_GRID: return CSS_DISPLAY_BLOCK; - } else if (value == CSS_DISPLAY_INLINE_FLEX) { + case CSS_DISPLAY_INLINE_FLEX: + case CSS_DISPLAY_INLINE_GRID: return CSS_DISPLAY_INLINE_BLOCK; + + default: + break; } return value; -- cgit v1.2.3