diff --git a/TODO.FACTOR.txt b/TODO.FACTOR.txt index 92315e961a..dc339b8bbd 100644 --- a/TODO.FACTOR.txt +++ b/TODO.FACTOR.txt @@ -20,15 +20,13 @@ + ui: -- markup: goofy if a block is the first thing in a table cell +- 'show' doesn't work if invoked from a listener on an object which is + itself inspected in the listener - ui uses too much cpu time idling -- table borders rendered badly -- why is the thumb skewed? - add some handy services: - base conversion - search help for selection - grid slows down with 2000 lines -- f should be clickable - clickable vocabs - remaining HTML issues need fixing - better component padding and spacing in UI diff --git a/library/help/markup.factor b/library/help/markup.factor index 55bf464968..a86a083062 100644 --- a/library/help/markup.factor +++ b/library/help/markup.factor @@ -158,7 +158,7 @@ M: object >link ; : $grid ( content style -- ) [ table-content-style [ - [ print-element ] tabular-output + [ last-element off print-element ] tabular-output ] with-style ] ($block) table last-element set ; diff --git a/library/ui/gadgets/grid-lines.factor b/library/ui/gadgets/grid-lines.factor index 070e799875..a541540c6c 100644 --- a/library/ui/gadgets/grid-lines.factor +++ b/library/ui/gadgets/grid-lines.factor @@ -23,7 +23,6 @@ SYMBOL: grid-dim M: grid-lines draw-boundary ( gadget paint -- ) #! Clean this up later. GL_MODELVIEW [ - 0.5 0.5 0 glTranslated grid-lines-color gl-color [ grid get rect-dim half-gap v- grid-dim set { 0 1 } draw-grid-lines diff --git a/library/ui/gadgets/presentations.factor b/library/ui/gadgets/presentations.factor index 4956d34ad1..9a81849f5b 100644 --- a/library/ui/gadgets/presentations.factor +++ b/library/ui/gadgets/presentations.factor @@ -24,7 +24,7 @@ M: object-button gadget-help ( button -- string ) ! Character styles : apply-style ( style gadget key quot -- style gadget ) - >r pick hash r> when* ; inline + >r pick hash* r> [ drop ] if ; inline : apply-foreground-style ( style gadget -- style gadget ) foreground [ over set-label-color ] apply-style ; diff --git a/library/ui/gadgets/sliders.factor b/library/ui/gadgets/sliders.factor index ed7b886a07..4a40ac18e7 100644 --- a/library/ui/gadgets/sliders.factor +++ b/library/ui/gadgets/sliders.factor @@ -97,7 +97,8 @@ C: elevator ( vector -- elevator ) [ set-gadget-orientation ] keep ; : (layout-thumb) ( slider n -- n thumb ) - over gadget-orientation n*v swap slider-thumb ; + over gadget-orientation n*v [ >fixnum ] map + swap slider-thumb ; : thumb-loc ( slider -- loc ) dup slider-value swap slider>screen ;