From 221b222f86f2abf2e1c7a641e007c1b910d0bf84 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Tue, 19 May 2020 07:41:06 -0700 Subject: [PATCH] Revert "ui.baseline-alignment: allow floats in alignment." This reverts commit c37e9551ad7121049bd7b46960c075dce0c9b8f1. --- 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 5cd2e48329..7bf8c79388 100644 --- a/basis/ui/baseline-alignment/baseline-alignment.factor +++ b/basis/ui/baseline-alignment/baseline-alignment.factor @@ -63,8 +63,8 @@ TUPLE: gadget-metrics height ascent descent cap-height ; ascent [ cap-height 0 or 2 / :> mid-line graphics-height 2 / - [ ascent mid-line - max mid-line + ] - [ descent mid-line + max mid-line - ] bi + [ ascent mid-line - max mid-line + floor >integer ] + [ descent mid-line + max mid-line - ceiling >integer ] bi ] [ f f ] if ; : (measure-metrics) ( children sizes -- graphics-height ascent descent cap-height ) @@ -84,14 +84,14 @@ PRIVATE> dup max-cap-height 0 or :> max-cap-height dup max-graphics-height :> max-graphics-height - max-cap-height max-graphics-height + 2 / :> critical-line + max-cap-height max-graphics-height + 2 /i :> critical-line critical-line max-ascent [-] :> text-leading max-ascent critical-line [-] :> graphics-leading [ dup ascent>> [ ascent>> max-ascent swap - text-leading ] - [ height>> max-graphics-height swap - 2 / graphics-leading ] if + + [ height>> max-graphics-height swap - 2 /i graphics-leading ] if + ] map ; : measure-metrics ( children sizes -- ascent descent )