From 33e72abff95a776f2ed13460a40c02e03e3492ca Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Sat, 16 May 2020 10:05:11 -0700 Subject: [PATCH] ui.baseline-alignment: better stack effects. --- basis/ui/baseline-alignment/baseline-alignment.factor | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/basis/ui/baseline-alignment/baseline-alignment.factor b/basis/ui/baseline-alignment/baseline-alignment.factor index e65d4c64fb..7bf8c79388 100644 --- a/basis/ui/baseline-alignment/baseline-alignment.factor +++ b/basis/ui/baseline-alignment/baseline-alignment.factor @@ -47,16 +47,16 @@ TUPLE: gadget-metrics height ascent descent cap-height ; : ?supremum ( seq -- n/f ) sift [ f ] [ supremum ] if-empty ; -: max-ascent ( seq -- n ) +: max-ascent ( seq -- n/f ) [ ascent>> ] map ?supremum ; -: max-cap-height ( seq -- n ) +: max-cap-height ( seq -- n/f ) [ cap-height>> ] map ?supremum ; -: max-descent ( seq -- n ) +: max-descent ( seq -- n/f ) [ descent>> ] map ?supremum ; -: max-graphics-height ( seq -- y ) +: max-graphics-height ( seq -- n ) [ ascent>> ] reject [ height>> ] map ?supremum 0 or ; :: combine-metrics ( graphics-height ascent descent cap-height -- ascent' descent' )