From 1f9fa090a3ab64dff0d300c0b15e4d3ad45c1c46 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Mon, 11 May 2009 17:04:32 -0500 Subject: [PATCH] Make focusable-child* work even if world has no children, to clean up a code duplication --- basis/ui/gadgets/worlds/worlds.factor | 2 +- extra/game-worlds/game-worlds.factor | 2 -- extra/opengl/demo-support/demo-support.factor | 3 --- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/basis/ui/gadgets/worlds/worlds.factor b/basis/ui/gadgets/worlds/worlds.factor index d85bba9992..af998c08b9 100755 --- a/basis/ui/gadgets/worlds/worlds.factor +++ b/basis/ui/gadgets/worlds/worlds.factor @@ -101,7 +101,7 @@ M: world layout* [ call-next-method ] [ dup layers>> [ as-big-as-possible ] with each ] bi ; -M: world focusable-child* gadget-child ; +M: world focusable-child* children>> [ t ] [ first ] if-empty ; M: world children-on nip children>> ; diff --git a/extra/game-worlds/game-worlds.factor b/extra/game-worlds/game-worlds.factor index fa6b326fa9..c9ea03e333 100644 --- a/extra/game-worlds/game-worlds.factor +++ b/extra/game-worlds/game-worlds.factor @@ -21,5 +21,3 @@ M: game-world end-world [ [ stop-loop ] when* f ] change-game-loop drop ; -M: game-world focusable-child* drop t ; - diff --git a/extra/opengl/demo-support/demo-support.factor b/extra/opengl/demo-support/demo-support.factor index 8afbd52647..e627a745cd 100755 --- a/extra/opengl/demo-support/demo-support.factor +++ b/extra/opengl/demo-support/demo-support.factor @@ -36,9 +36,6 @@ M: demo-world distance-step ( gadget -- dz ) : zoom-demo-world ( distance gadget -- ) [ + ] with change-distance relayout-1 ; -M: demo-world focusable-child* ( world -- gadget ) - drop t ; - M: demo-world pref-dim* ( gadget -- dim ) drop { 640 480 } ;