Remove gadget-help generic word

slava 2006-08-26 07:20:58 +00:00
parent 76e965d493
commit 3921584818
5 changed files with 9 additions and 10 deletions

View File

@ -1,7 +1,6 @@
+ 0.84:
- default font should not be monospaced
- better looking status bar
- new browser:
- show currently selected vocab & words
- scroll to existing won't work

View File

@ -99,11 +99,6 @@ M: gadget children-on nip gadget-children ;
: set-gadget-delegate ( delegate gadget -- )
dup pick [ set-gadget-parent ] each-child-with set-delegate ;
! Pointer help protocol
GENERIC: gadget-help
M: gadget gadget-help drop f ;
: with-gadget ( gadget quot -- )
[ swap gadget set call ] with-scope ; inline

View File

@ -163,7 +163,11 @@ M: pack stream-close drop ;
M: paragraph stream-close drop ;
: gadget-write ( string gadget -- )
over empty? [ 2drop ] [ >r <label> r> add-gadget ] if ;
over empty? [
2drop
] [
>r <label> dup text-theme r> add-gadget
] if ;
M: pack stream-write gadget-write ;

View File

@ -91,6 +91,10 @@ USING: arrays gadgets kernel sequences styles ;
solid-black swap set-gadget-interior ;
: label-theme ( gadget -- )
{ 0.0 0.0 0.0 1.0 } over set-label-color
{ "sans-serif" plain 12 } swap set-label-font ;
: text-theme ( gadget -- )
{ 0.0 0.0 0.0 1.0 } over set-label-color
{ "monospace" plain 12 } swap set-label-font ;

View File

@ -143,9 +143,6 @@ V{ } clone hand-buttons set-global
: hand-click-rel ( gadget -- loc )
hand-click-loc get-global relative-loc ;
: relevant-help ( seq -- help )
[ gadget-help ] map [ ] find nip ;
: under-hand ( -- seq )
#! A sequence whose first element is the world and last is
#! the current gadget, with all parents in between.