fix some weird focus issues

1 files changed, 22 insertions, 0 deletions

diff --git a/js/tool.js b/js/tool.js
index 81ab43b..2953dbc 100644
--- a/js/tool.js
+++ b/js/tool.js
@@ -9,6 +9,7 @@ var Tool = Model({
   done: function(){},
   focus: function(){
     // focused && focused.blur()
+    console.log("focusing ", this.name)
     current_tool && current_tool.blur()
     current_tool = this
     this.span.classList.add('focused')
@@ -17,6 +18,7 @@ var Tool = Model({
   },
   blur: function(){
     current_tool = null
+    console.log("blurring ", this.name)
     this.span.classList.remove('focused')
     this.done()
   }
@@ -37,15 +39,35 @@ var Checkbox = Tool.extend({
 
 var BlurredCheckbox = Checkbox.extend({
   focus: function(){
+    if (current_tool.name == "shader") {
+      shader.toggle(false)
+      current_tool.blur()
+      current_tool = controls.circle
+    }
     this.use()
     if (this.name != 'shader' && is_desktop) { cursor_input.focus() }
+  },
+  blur: function(){
+    console.log("blurring ", this.name)
+    this.span.classList.remove('focused')
+    this.done()
   }
 })
 
 var BlurredTool = Tool.extend({
   focus: function(){
+    if (current_tool.name == "shader") {
+      shader.toggle(false)
+      current_tool.blur()
+      current_tool = controls.circle
+    }
     this.use()
     if (this.name != 'shader' && is_desktop) { cursor_input.focus() }
+  },
+  blur: function(){
+    console.log("blurring ", this.name)
+    this.span.classList.remove('focused')
+    this.done()
   }
 })