Merge branch 'master' of git://factorforge.org/git/william42
						commit
						c4cab0678a
					
				| 
						 | 
					@ -4,11 +4,11 @@
 | 
				
			||||||
USING: accessors kernel fry math math.vectors sequences arrays vectors assocs
 | 
					USING: accessors kernel fry math math.vectors sequences arrays vectors assocs
 | 
				
			||||||
       hashtables models models.range models.compose combinators
 | 
					       hashtables models models.range models.compose combinators
 | 
				
			||||||
       ui ui.gadgets ui.gadgets.buttons ui.gadgets.frames ui.gadgets.packs
 | 
					       ui ui.gadgets ui.gadgets.buttons ui.gadgets.frames ui.gadgets.packs
 | 
				
			||||||
       ui.gadgets.incremental ui.gadgets.viewports ui.gadgets.books ;
 | 
					       ui.gadgets.grids ui.gadgets.viewports ui.gadgets.books ;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
IN: ui.gadgets.tabs
 | 
					IN: ui.gadgets.tabs
 | 
				
			||||||
 | 
					
 | 
				
			||||||
TUPLE: tabbed names model toggler content ;
 | 
					TUPLE: tabbed < frame names toggler content ;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
DEFER: (del-page)
 | 
					DEFER: (del-page)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -48,8 +48,9 @@ DEFER: (del-page)
 | 
				
			||||||
    [ names>> index ] 2keep (del-page) ;
 | 
					    [ names>> index ] 2keep (del-page) ;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
: <tabbed> ( assoc -- tabbed )
 | 
					: <tabbed> ( assoc -- tabbed )
 | 
				
			||||||
    tabbed new
 | 
					    tabbed new-frame
 | 
				
			||||||
    [ <pile> 1 >>fill g-> (>>toggler) @left frame,
 | 
					    [ g 0 <model> >>model
 | 
				
			||||||
      [ keys >vector g (>>names) ]
 | 
					      <pile> 1 >>fill [ >>toggler ] keep swap @left grid-add
 | 
				
			||||||
      [ values 0 <model> [ <book> g-> (>>content) @center frame, ] keep ] bi
 | 
					      [ keys g swap >>names ]
 | 
				
			||||||
      g swap >>model redo-toggler ] build-frame ;
 | 
					      [ values g model>> <book> [ >>content ] keep swap @center grid-add ] bi
 | 
				
			||||||
 | 
					      g redo-toggler g ] with-gadget ;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue