@@ -864,12 +864,10 @@
 	    (hash-table-set! tests-draw-state 'first-time #f)
 	    (hash-table-set! tests-draw-state 'scalef 1)
 	    (hash-table-set! tests-draw-state 'tests-info (make-hash-table))
 	    (hash-table-set! tests-draw-state 'selected-tests (make-hash-table))
 	    ;; set these 
-	    (hash-table-set! tests-draw-state 'test-browse-xoffset 20) ;; (- 0 (* (/ sizex 2) (* 8 xadj))))
-	    (hash-table-set! tests-draw-state 'test-browse-yoffset 20) ;; (- 0 (* (/ sizey 2) (* 8 (- 1 yadj)))))))
 	    (dcommon:initial-draw-tests cnv xadj yadj sizex sizey sizexmm sizeymm originx originy tests-draw-state sorted-testnames test-records))
 	  (dcommon:redraw-tests cnv xadj yadj sizex sizey sizexmm sizeymm originx originy tests-draw-state sorted-testnames test-records))
       ))
 
 ;;======================================================================
@@ -1068,51 +1066,51 @@
 			    #:expand "YES"
 			    #:scrollbar "YES"
 			    #:posx "0.5"
 			    #:posy "0.5"
 			    #:button-cb (lambda (obj btn pressed x y status)
-					  (print "obj: " obj ", pressed " pressed ", status " status)
-					  (print "canvas-origin: " (canvas-origin the-cnv))
-					  (let-values (((xx yy)(canvas-origin the-cnv)))
-					    (canvas-transform-set! the-cnv #f)
-					    (print "canvas-origin: " xx " " yy " click at " x " " y))
-					  (let* ((tests-info     (hash-table-ref tests-draw-state  'tests-info))
-						 (selected-tests (hash-table-ref tests-draw-state  'selected-tests))
+					  ;; (print "obj: " obj ", pressed " pressed ", status " status)
+					  ; (print "canvas-origin: " (canvas-origin the-cnv))
+					  ;; (let-values (((xx yy)(canvas-origin the-cnv)))
+					    ;; (canvas-transform-set! the-cnv #f)
+					    ;; (print "canvas-origin: " xx " " yy " click at " x " " y))
+					  (let* ((tests-info     (hash-table-ref tests-draw-state 'tests-info))
+						 (selected-tests (hash-table-ref tests-draw-state 'selected-tests))
 						 (scalef         (hash-table-ref tests-draw-state 'scalef))
-						 (x-scaled       (/ x scalef))
-						 (y-scaled       (/ y scalef)))
+						 (sizey          (hash-table-ref tests-draw-state 'sizey))
+						 (xoffset        (dcommon:get-xoffset tests-draw-state #f #f))
+						 (yoffset        (dcommon:get-yoffset tests-draw-state #f #f))
+						 (new-y          (- sizey y)))
+					    ;; (print "xoffset=" xoffset ", yoffset=" yoffset)
 					    ;; (print "\tx\ty\tllx\tlly\turx\tury")
 					    (for-each (lambda (test-name)
 							(let* ((rec-coords (hash-table-ref tests-info test-name))
-							       (llx        (list-ref rec-coords 0))
-							       (urx        (list-ref rec-coords 1))
-							       (lly        (list-ref rec-coords 2))
-							       (ury        (list-ref rec-coords 3)))
-							  (if (eq? pressed 1)
-							      (print "\tx=" x "\ty=" y "\t" llx "\t" lly "\t" urx "\t" ury "\t" test-name " "))
+							       (llx        (dcommon:x->canvas (list-ref rec-coords 0) scalef xoffset))
+							       (lly        (dcommon:y->canvas (list-ref rec-coords 1) scalef yoffset))
+							       (urx        (dcommon:x->canvas (list-ref rec-coords 2) scalef xoffset))
+							       (ury        (dcommon:y->canvas (list-ref rec-coords 3) scalef yoffset)))
+							  ;; (if (eq? pressed 1)
+							  ;;    (print "\tx=" x "\ty=" y "\tnew-y=" new-y "\tllx=" llx "\tlly=" lly "\turx=" urx "\tury=" ury "\t" test-name " "))
 							  (if (and (eq? pressed 1)
-								   (>= x-scaled llx)
-								   (>= y-scaled lly)
-								   (<= x-scaled urx)
-								   (<= y-scaled ury))
+								   (>= x llx)
+								   (>= new-y lly)
+								   (<= x urx)
+								   (<= new-y ury))
 							      (let ((patterns (string-split (iup:attribute test-patterns-textbox "VALUE"))))
 								(let* ((selected     (not (member test-name patterns)))
 								       (newpatt-list (if selected
 											 (cons test-name patterns)
 											 (delete test-name patterns)))
 								       (newpatt      (string-intersperse newpatt-list "\n")))
-								  ;; (if cnv-obj
-								  ;;    (dashboard:draw-tests cnv-obj 0 0 tests-draw-state sorted-testnames))
 								  (iup:attribute-set! obj "REDRAW" "ALL")
 								  (hash-table-set! selected-tests test-name selected)
 								  (iup:attribute-set! test-patterns-textbox "VALUE" newpatt)
 								  (dboard:data-set-test-patts! *data* (dboard:lines->test-patt newpatt))
 								  (dashboard:update-run-command)
 								  (if updater (updater last-xadj last-yadj)))))))
 						      (hash-table-keys tests-info)))))))
 	  canvas-obj)))
-      ;; (print "obj: " obj " btn: " btn " pressed: " pressed " x: " x " y: " y " status: " status))
        
       (iup:frame
        #:title "Logs" ;; To be replaced with tabs
        (let ((logs-tb (iup:textbox #:expand "YES"
 				   #:multiline "YES")))