steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "ui.baseline-alignment: allow floats in alignment." 

This reverts commit c37e9551ad.
master
John Benediktsson 2020-05-19 07:41:06 -07:00
parent 1ee94a168b
commit 221b222f86
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
basis/ui/baseline-alignment/baseline-alignment.factor
View File

@ -63,8 +63,8 @@ TUPLE: gadget-metrics height ascent descent cap-height ;
ascent [ ascent [
cap-height 0 or 2 / :> mid-line cap-height 0 or 2 / :> mid-line
graphics-height 2 / graphics-height 2 /
[ ascent mid-line - max mid-line + ] [ ascent mid-line - max mid-line + floor >integer ]
[ descent mid-line + max mid-line - ] bi [ descent mid-line + max mid-line - ceiling >integer ] bi
] [ f f ] if ; ] [ f f ] if ;
: (measure-metrics) ( children sizes -- graphics-height ascent descent cap-height ) : (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-cap-height 0 or :> max-cap-height
dup max-graphics-height :> max-graphics-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 critical-line max-ascent [-] :> text-leading
max-ascent critical-line [-] :> graphics-leading max-ascent critical-line [-] :> graphics-leading
[ [
dup ascent>> dup ascent>>
[ ascent>> max-ascent swap - text-leading ] [ 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 ; ] map ;
: measure-metrics ( children sizes -- ascent descent ) : measure-metrics ( children sizes -- ascent descent )