[modify] get-focus & refocus-on: allow focus on not focusablep

1 files changed, 4 insertions, 4 deletions

diff --git a/wheelwork.lisp b/wheelwork.lisp
index c03a444..952dd22 100644
--- a/wheelwork.lisp
+++ b/wheelwork.lisp
@@ -372,9 +372,9 @@ necessary."
 
 
 (defun refocus-on (target &optional (app *application*))
-  "Sets focus of application to TARGET, if TARGET is focusable. "
-  (when (focusablep target) 
-    (setf (application-focus app) target)))
+  "Sets focus of application to TARGET. This works whether or not
+TARGET is FOCUSABLEP"
+  (setf (application-focus app) target))
 
 (defun get-focus (&optional (app *application*))
   (or (application-focus app) app))
@@ -428,7 +428,7 @@ give focus to whatever was clicked."
     (let ((target
             (or (unit-under app x y)    ; if no unit is under the mouse,
                 app)))                  ; then target the app itself
-      (when (refocus-on-mousedown-p app)
+      (when (and (refocus-on-mousedown-p app) (focusablep target))
         (refocus-on target))              
       (when-let (handler (get-handler-for target 'mousedown))
         (funcall handler target x y clicks button wx wy)))))