Merge branch 'master' of git://factorcode.org/git/factor
						commit
						ec46665170
					
				| 
						 | 
				
			
			@ -13,7 +13,7 @@ ARTICLE: "ui-pack-layout" "Pack layouts"
 | 
			
		|||
{ $subsection make-pile }
 | 
			
		||||
{ $subsection make-filled-pile }
 | 
			
		||||
{ $subsection make-shelf }
 | 
			
		||||
{ $subsection gadget, }
 | 
			
		||||
 | 
			
		||||
"For more control, custom layouts can reuse portions of pack layout logic:"
 | 
			
		||||
{ $subsection pack-pref-dim }
 | 
			
		||||
{ $subsection pack-layout } ;
 | 
			
		||||
| 
						 | 
				
			
			@ -66,14 +66,14 @@ HELP: pack-pref-dim
 | 
			
		|||
 | 
			
		||||
HELP: make-pile
 | 
			
		||||
{ $values { "quot" quotation } { "pack" "a new " { $link pack } } }
 | 
			
		||||
{ $description "Creates a new " { $link pack } " which lays out a sequence of gadgets vertically. The quotation can add children by calling the " { $link gadget, } " word." } ;
 | 
			
		||||
{ $description "Creates a new " { $link pack } " which lays out a sequence of gadgets vertically. The quotation can add children by calling the gadget, word." } ;
 | 
			
		||||
 | 
			
		||||
HELP: make-filled-pile
 | 
			
		||||
{ $values { "quot" quotation } { "pack" "a new " { $link pack } } }
 | 
			
		||||
{ $description "Creates a new " { $link pack } " which lays out a sequence of gadgets vertically, such that all gadgets have the same width. The quotation can add children by calling the " { $link gadget, } " word." } ;
 | 
			
		||||
{ $description "Creates a new " { $link pack } " which lays out a sequence of gadgets vertically, such that all gadgets have the same width. The quotation can add children by calling the gadget, word." } ;
 | 
			
		||||
 | 
			
		||||
HELP: make-shelf
 | 
			
		||||
{ $values { "quot" quotation } { "pack" "a new " { $link pack } } }
 | 
			
		||||
{ $description "Creates a new " { $link pack } " which lays out a sequence of gadgets horizontally. The quotation can add children by calling the " { $link gadget, } " word." } ;
 | 
			
		||||
{ $description "Creates a new " { $link pack } " which lays out a sequence of gadgets horizontally. The quotation can add children by calling the gadget, word." } ;
 | 
			
		||||
 | 
			
		||||
ABOUT: "ui-pack-layout"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -235,7 +235,7 @@ $nl
 | 
			
		|||
$nl
 | 
			
		||||
"Gadget construction combinators whose names are prefixed with " { $snippet "make-" } " construct new gadgets and push them on the stack. The primitive combinator used to define all combinators of this form:"
 | 
			
		||||
{ $subsection make-gadget }
 | 
			
		||||
"Words such as " { $link gadget, } " and " { $link track, } " access the gadget through the " { $link gadget } " variable."
 | 
			
		||||
"Words such as " { $link track, } " access the gadget through the " { $link gadget } " variable."
 | 
			
		||||
$nl
 | 
			
		||||
"A combinator which stores a gadget in the " { $link gadget } " variable:"
 | 
			
		||||
{ $subsection with-gadget }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue