diff --git a/core/ui/gadgets.factor b/core/ui/gadgets.factor index 7b60bef3ae..9c324502fd 100644 --- a/core/ui/gadgets.factor +++ b/core/ui/gadgets.factor @@ -38,13 +38,6 @@ M: array rect-dim drop { 0 0 } ; : intersects? ( rect/point rect -- ? ) (rect-intersect) [v-] { 0 0 } = ; -! gadget-pref-dim is a cached value; call pref-dim instead -! gadget-children is a vector -! gadget-orientation is { 1 0 } or { 0 1 } -! gadget-state is f, relayout or relayout-1 -! gadget-root? relayout requests do not propogate higher -! gadget-grafted? are we part of a live world's gadget hierarchy -! gadget-interior, gadget-boundary: see paint.factor TUPLE: gadget pref-dim parent children orientation state visible? root? clipped? grafted? @@ -89,7 +82,7 @@ M: gadget children-on nip gadget-children ; : (pick-up) ( point gadget -- gadget/f ) dupd children-on [ inside? ] find-with nip ; -: translate ( point -- ) origin [ v+ ] change ; +: translate ( rect/point -- ) rect-loc origin [ v+ ] change ; : pick-up ( point gadget -- child/f ) [ diff --git a/core/ui/paint.factor b/core/ui/paint.factor index ef40870116..1c3f02dd58 100644 --- a/core/ui/paint.factor +++ b/core/ui/paint.factor @@ -37,7 +37,7 @@ DEFER: draw-gadget : (draw-gadget) ( gadget -- ) [ - dup rect-loc translate + dup translate dup dup gadget-interior draw-interior dup draw-gadget* dup visible-children [ draw-gadget ] each