Commit 3b6fd96a authored by Dave Griffiths's avatar Dave Griffiths
Browse files

callbacks in scroll fixed

parent 90e8000b
...@@ -689,6 +689,7 @@ ...@@ -689,6 +689,7 @@
((equal? (widget-type w) "relative-layout") (relative-layout-children w)) ((equal? (widget-type w) "relative-layout") (relative-layout-children w))
((equal? (widget-type w) "frame-layout") (frame-layout-children w)) ((equal? (widget-type w) "frame-layout") (frame-layout-children w))
((equal? (widget-type w) "scroll-view") (scroll-view-children w)) ((equal? (widget-type w) "scroll-view") (scroll-view-children w))
((equal? (widget-type w) "scroll-view-vert") (scroll-view-children w))
((equal? (widget-type w) "draggable") (draggable-children w)) ((equal? (widget-type w) "draggable") (draggable-children w))
;; ((equal? (widget-type w) "grid-layout") (grid-layout-children w)) ;; ((equal? (widget-type w) "grid-layout") (grid-layout-children w))
(else '()))) (else '())))
......
...@@ -57,6 +57,7 @@ ...@@ -57,6 +57,7 @@
(list 'user-id (list "User ID" "User ID" "User ID")) (list 'user-id (list "User ID" "User ID" "User ID"))
(list 'ok (list "Ok" "Ok" "Ok")) (list 'ok (list "Ok" "Ok" "Ok"))
(list 'cancel (list "Cancel" "Cancel" "Cancel")) (list 'cancel (list "Cancel" "Cancel" "Cancel"))
(list '+ (list "+" "+" "+"))
)) ))
(define (mtext-lookup id) (define (mtext-lookup id)
...@@ -337,17 +338,17 @@ ...@@ -337,17 +338,17 @@
0 (layout 'fill-parent 'fill-parent 1 'left 0) 0 (layout 'fill-parent 'fill-parent 1 'left 0)
(list (list
(vert-fill (vert-fill
(mtitle "" 'title) (mtitle "" 'title)
(horiz (horiz
(medit-text "user-id" 'user-id "normal" (lambda () (list))) (medit-text "user-id" 'user-id "normal" (lambda () (list)))
(mbutton-scale "sync" 'sync (lambda () (list)))) (mbutton-scale "sync-button" 'sync (lambda () (list))))
(mspinner "languages" 'languages (list 'english 'khasi 'hindi) (lambda (c) (list))) (mspinner "languages" 'languages (list 'english 'khasi 'hindi) (lambda (c) (list)))
(mbutton "new-village" 'new-village (lambda () (list (start-activity "village" 0 "")))) (horiz
(mtext "" 'villages)
))) (mbutton "new-village" '+
(lambda ()
(list (start-activity "village" 0 ""))))))))
(relative (relative
'(("parent-bottom")) '(("parent-bottom"))
...@@ -360,9 +361,7 @@ ...@@ -360,9 +361,7 @@
(lambda (activity arg) (lambda (activity arg)
(activity-layout activity)) (activity-layout activity))
(lambda (activity arg) (lambda (activity arg)
(let ((user-id (ktv-get (get-entity db "local" 1) "user-id"))) (list))
(set-current! 'user-id user-id)
(list)))
(lambda (activity) '()) (lambda (activity) '())
(lambda (activity) '()) (lambda (activity) '())
(lambda (activity) '()) (lambda (activity) '())
...@@ -388,18 +387,6 @@ ...@@ -388,18 +387,6 @@
(mtext "" 'database) (mtext "" 'database)
(mbutton "main-sync" 'sync (lambda () (list (start-activity "sync" 0 "")))) (mbutton "main-sync" 'sync (lambda () (list (start-activity "sync" 0 ""))))
(mspinner-other "test" 'test (list 'one 'two 'three) (lambda (c) (list))) (mspinner-other "test" 'test (list 'one 'two 'three) (lambda (c) (list)))
(mbutton "main-sync" 'sync (lambda () (list (start-activity "sync" 0 ""))))
(mspinner-other "test" 'test (list 'one 'two 'three) (lambda (c) (list)))
(mbutton "main-sync" 'sync (lambda () (list (start-activity "sync" 0 ""))))
(mspinner-other "test" 'test (list 'one 'two 'three) (lambda (c) (list)))
(mbutton "main-sync" 'sync (lambda () (list (start-activity "sync" 0 ""))))
(mspinner-other "test" 'test (list 'one 'two 'three) (lambda (c) (list)))
(mbutton "main-sync" 'sync (lambda () (list (start-activity "sync" 0 ""))))
(mspinner-other "test" 'test (list 'one 'two 'three) (lambda (c) (list)))
(mbutton "main-sync" 'sync (lambda () (list (start-activity "sync" 0 ""))))
(mspinner-other "test" 'test (list 'one 'two 'three) (lambda (c) (list)))
(mbutton "main-sync" 'sync (lambda () (list (start-activity "sync" 0 ""))))
(mspinner-other "test" 'test (list 'one 'two 'three) (lambda (c) (list)))
))) )))
(relative (relative
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment