From 8b3942a1bef0dd32da05d57bc74da37f1d7cc07e Mon Sep 17 00:00:00 2001 From: Johan Ceuppens Date: Tue, 17 Jan 2012 01:46:39 +0000 Subject: [PATCH] widget tree system should be operational - untested. --- scsh/scgame/NEWS | 2 ++ scsh/scgame/scgamewidgets.scm | 2 ++ 2 files changed, 4 insertions(+) diff --git a/scsh/scgame/NEWS b/scsh/scgame/NEWS index 7af6637..dc67cb7 100644 --- a/scsh/scgame/NEWS +++ b/scsh/scgame/NEWS @@ -1,2 +1,4 @@ version 0.1 +* button widget +* widget tree system * line drawing algorithm and xanadu file system diff --git a/scsh/scgame/scgamewidgets.scm b/scsh/scgame/scgamewidgets.scm index 26125e7..0cdd6d9 100644 --- a/scsh/scgame/scgamewidgets.scm +++ b/scsh/scgame/scgamewidgets.scm @@ -59,6 +59,8 @@ (define (widget-node-collide? node x y) (define (frec l) (cond ((null? l) #f) + ((list? (car l)) + (frec (car l))) ((and (widget? (car l)) (>= x (((car l)'get-x))) (<= x (+ (((car l)'get-x)))(((car l)'get-w)))