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

ui.gadgets.paragraphs: update for wrap.words API

db4
Slava Pestov 2009-02-09 01:47:41 -06:00
parent fe59b4d24d
commit 699ac62bc9
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/gadgets/paragraphs/paragraphs.factor
View File

@ -1,7 +1,7 @@
! Copyright (C) 2005, 2009 Slava Pestov ! Copyright (C) 2005, 2009 Slava Pestov
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: accessors kernel math math.order sequences wrap arrays fry USING: accessors kernel math math.order sequences wrap wrap.words
ui.gadgets ui.gadgets.labels ui.render ; arrays fry ui.gadgets ui.gadgets.labels ui.render ;
IN: ui.gadgets.paragraphs IN: ui.gadgets.paragraphs
MIXIN: word-break MIXIN: word-break
@ -35,8 +35,8 @@ TUPLE: line words ascent descent ;
dup [ key>> ] map dup pref-dims baseline-metrics line boa ; dup [ key>> ] map dup pref-dims baseline-metrics line boa ;
: wrap-paragraph ( paragraph -- wrapped-paragraph ) : wrap-paragraph ( paragraph -- wrapped-paragraph )
[ children>> [ gadget>word ] map ] [ margin>> ] bi wrap [ children>> [ gadget>word ] map ] [ margin>> ] bi
[ <line> ] map ; dup wrap-words [ <line> ] map ;
: line-width ( wrapped-line -- n ) : line-width ( wrapped-line -- n )
[ break?>> ] trim-tail-slice [ width>> ] sigma ; [ break?>> ] trim-tail-slice [ width>> ] sigma ;