diff --git a/extra/ui/gadgets/books/books.factor b/extra/ui/gadgets/books/books.factor index 9f92266efe..3ff9c63726 100755 --- a/extra/ui/gadgets/books/books.factor +++ b/extra/ui/gadgets/books/books.factor @@ -25,6 +25,6 @@ M: book model-changed ( model book -- ) M: book pref-dim* ( book -- dim ) children>> pref-dims max-dim ; M: book layout* ( book -- ) - [ dim>> ] [ children>> ] bi [ set-layout-dim ] with each ; + [ dim>> ] [ children>> ] bi [ (>>dim) ] with each ; M: book focusable-child* ( book -- child/t ) current-page ; diff --git a/extra/ui/gadgets/borders/borders.factor b/extra/ui/gadgets/borders/borders.factor index d1cf7cfb29..da21c06a1b 100644 --- a/extra/ui/gadgets/borders/borders.factor +++ b/extra/ui/gadgets/borders/borders.factor @@ -42,7 +42,7 @@ M: border pref-dim* M: border layout* dup border-child-rect swap gadget-child over loc>> over set-rect-loc - swap dim>> swap set-layout-dim ; + swap dim>> swap (>>dim) ; M: border focusable-child* gadget-child ; diff --git a/extra/ui/gadgets/gadgets-docs.factor b/extra/ui/gadgets/gadgets-docs.factor index ac428799ab..42b6d6a9cd 100755 --- a/extra/ui/gadgets/gadgets-docs.factor +++ b/extra/ui/gadgets/gadgets-docs.factor @@ -65,15 +65,9 @@ HELP: relayout-1 { relayout relayout-1 } related-words -HELP: set-layout-dim -{ $values { "dim" "a pair of integers" } { "gadget" gadget } } -{ $description "Resizes a gadget inside a " { $link layout* } " method." } -{ $warning "Do not call this word outside of a " { $link layout* } " method, or otherwise the gadget will not be relayout automatically. Instead, use " { $link set-gadget-dim } "." } ; - HELP: set-gadget-dim { $values { "dim" "a pair of integers" } { "gadget" gadget } } -{ $description "Resizes and relayouts a gadget before the next iteration of the event loop." } -{ $warning "Do not call this word inside a " { $link layout* } " method, or otherwise unnecessary work will be done by the UI to ensure the gadget is relayout. Instead, use " { $link set-layout-dim } "." } ; +{ $description "Resizes and relayouts a gadget before the next iteration of the event loop." } ; HELP: pref-dim* { $values { "gadget" gadget } { "dim" "a pair of integers" } } diff --git a/extra/ui/gadgets/gadgets.factor b/extra/ui/gadgets/gadgets.factor index 3a6af52b1a..561562b893 100755 --- a/extra/ui/gadgets/gadgets.factor +++ b/extra/ui/gadgets/gadgets.factor @@ -198,7 +198,7 @@ GENERIC: layout* ( gadget -- ) M: gadget layout* drop ; -: prefer ( gadget -- ) dup pref-dim swap set-layout-dim ; +: prefer ( gadget -- ) dup pref-dim swap (>>dim) ; : validate ( gadget -- ) f swap (>>layout-state) ; diff --git a/extra/ui/gadgets/grids/grids.factor b/extra/ui/gadgets/grids/grids.factor index b53bf063f2..fcc1f691e9 100644 --- a/extra/ui/gadgets/grids/grids.factor +++ b/extra/ui/gadgets/grids/grids.factor @@ -66,7 +66,7 @@ M: grid pref-dim* : resize-grid ( grid horiz vert -- ) pick grid-fill? [ - pair-up swap [ set-layout-dim ] do-grid + pair-up swap [ (>>dim) ] do-grid ] [ 2drop grid>> [ [ prefer ] each ] each ] if ; diff --git a/extra/ui/gadgets/packs/packs.factor b/extra/ui/gadgets/packs/packs.factor index c33217a494..08a034d195 100755 --- a/extra/ui/gadgets/packs/packs.factor +++ b/extra/ui/gadgets/packs/packs.factor @@ -31,7 +31,7 @@ TUPLE: pack < gadget : pack-layout ( pack sizes -- ) round-dims over gadget-children - >r dupd packed-dims r> 2dup [ set-layout-dim ] 2each + >r dupd packed-dims r> 2dup [ (>>dim) ] 2each >r packed-locs r> [ set-rect-loc ] 2each ; : ( orientation -- pack ) diff --git a/extra/ui/gadgets/sliders/sliders.factor b/extra/ui/gadgets/sliders/sliders.factor index 4e081d972f..fba5f5df48 100755 --- a/extra/ui/gadgets/sliders/sliders.factor +++ b/extra/ui/gadgets/sliders/sliders.factor @@ -110,7 +110,7 @@ elevator H{ dup dup thumb-dim (layout-thumb) >r >r dup rect-dim r> rot gadget-orientation set-axis [ ceiling ] map - r> set-layout-dim ; + r> (>>dim) ; : layout-thumb ( slider -- ) dup layout-thumb-loc layout-thumb-dim ; diff --git a/extra/ui/gadgets/viewports/viewports.factor b/extra/ui/gadgets/viewports/viewports.factor index 91265abcfa..bbe64e7ec5 100755 --- a/extra/ui/gadgets/viewports/viewports.factor +++ b/extra/ui/gadgets/viewports/viewports.factor @@ -23,7 +23,7 @@ TUPLE: viewport < gadget ; M: viewport layout* dup rect-dim viewport-gap 2 v*n v- over gadget-child pref-dim vmax - swap gadget-child set-layout-dim ; + swap gadget-child (>>dim) ; M: viewport focusable-child* gadget-child ; diff --git a/extra/ui/gadgets/worlds/worlds.factor b/extra/ui/gadgets/worlds/worlds.factor index 0e7fbb4c30..69bb8a13c0 100755 --- a/extra/ui/gadgets/worlds/worlds.factor +++ b/extra/ui/gadgets/worlds/worlds.factor @@ -46,7 +46,7 @@ M: world request-focus-on ( child gadget -- ) M: world layout* dup call-next-method dup world-glass [ - >r dup rect-dim r> set-layout-dim + >r dup rect-dim r> (>>dim) ] when* drop ; M: world focusable-child* gadget-child ; diff --git a/extra/ui/ui-docs.factor b/extra/ui/ui-docs.factor index 4181f60d81..e95109c667 100755 --- a/extra/ui/ui-docs.factor +++ b/extra/ui/ui-docs.factor @@ -244,7 +244,6 @@ ARTICLE: "ui-layout-impl" "Implementing layout gadgets" { $subsection layout* } "When a " { $link layout* } " method is called, the size and location of the gadget has already been determined by its parent, and the method's job is to lay out the gadget's children. Children can be positioned and resized with a pair of words:" { $subsection set-rect-loc } -{ $subsection set-layout-dim } "Some assorted utility words which are useful for implementing layout logic:" { $subsection pref-dim } { $subsection pref-dims }