toggle whether ur drawing fg bg or char

3 files changed, 10 insertions, 8 deletions

diff --git a/index.html b/index.html
index 4d2c07e..d431ebe 100644
--- a/index.html
+++ b/index.html
@@ -9,7 +9,14 @@
 
   <div style="clear:both">
     <div id="palette_rapper" class="rapper"></div>
-    <div id="brush_rapper" class="rapper"></div>
+    <div id="brush_container" class="block">
+			<div id="brush_rapper">
+			</div>
+  		<br>
+      <span id="fg_checkbox" class="tool">x fg</span><br>
+      <span id="bg_checkbox" class="tool">x bg</span><br>
+      <span id="char_checkbox" class="tool">x char</span><br>
+    </div>
     <div id="tools_rapper" class="block">
     	<span id="square_el" class="tool">square</span><br>
       <span id="circle_el" class="tool">circle</span><br>
@@ -22,10 +29,6 @@
 			<br>
       brush size: <span id="width_el" class="ed">5</span> x <span id="height_el" class="ed">5</span><br>
       canvas size: <span id="canvas_width_el" class="ed">80</span> x <span id="canvas_height_el" class="ed">24</span><br>
-  		<br>
-      <span id="fg_checkbox" class="tool">x fg</span><br>
-      <span id="bg_checkbox" class="tool">x bg</span><br>
-      <span id="char_checkbox" class="tool">x char</span><br>
     </div>
 		
 		<div id="textarea_mode">
diff --git a/js/draw.js b/js/draw.js
index 6bf55bd..fbbfbc1 100644
--- a/js/draw.js
+++ b/js/draw.js
@@ -46,7 +46,7 @@ var draw = (function(){
           canvas.aa[t][s].erase(lex)
         }
         else {
-          canvas.aa[t][s].clone(lex)
+          canvas.aa[t][s].paint(lex)
         }
       }
     })
diff --git a/js/ui/palette.js b/js/ui/palette.js
index 54211fb..3976100 100644
--- a/js/ui/palette.js
+++ b/js/ui/palette.js
@@ -16,7 +16,7 @@ var palette = (function(){
 				e.preventDefault()
 				dragging = true
 				erasing = e.which == "3"
-				brush.fg = lex.fg
+				brush.fg = lex.bg
 				brush.bg = lex.bg
 				if (! brush.modified) {
 					brush.generate()
@@ -29,4 +29,3 @@ var palette = (function(){
 	return palette
 
 })()
-