color assignment logik

1 files changed, 8 insertions, 3 deletions

diff --git a/js/ui/letters.js b/js/ui/letters.js
index 9801a45..cd9e50b 100644
--- a/js/ui/letters.js
+++ b/js/ui/letters.js
@@ -1,11 +1,15 @@
 var letters = (function(){
 
+  var last_charset = ""
+  
   var letters = new Matrix (1, 1, function(x,y){
     var lex = new Lex (x,y)
     return lex
   })
 
   letters.repaint = function(charset){
+    charset = charset || last_charset
+    last_charset = charset
     var chars = unicode.block(charset, 32)
     if (chars[0] != " ") chars.unshift(" ")
     letters.resize( 32, Math.ceil( chars.length / 32 ) )
@@ -14,13 +18,13 @@ var letters = (function(){
 
   	letters.forEach(function(lex,x,y){
   	  var char = chars[i++]
-  	  if (char == " ") {
+  	  if (palette.chars.indexOf(brush.char) > 1) {
         lex.bg = brush.fg
         lex.fg = brush.bg
   	  }
   	  else {
-        lex.bg = brush.bg
-        lex.fg = brush.fg
+        lex.bg = colors.black
+        lex.fg = brush.fg == fillColor ? colors.black : brush.fg
   	  }
       lex.char = char
       lex.opacity = 1
@@ -52,6 +56,7 @@ var letters = (function(){
         if (! brush.modified) {
           brush.generate()
         }
+        palette.repaint()
       })
       lex.span.addEventListener('contextmenu', function(e){
         e.preventDefault()