diff options
Diffstat (limited to 'js/ui')
| -rw-r--r-- | js/ui/brush.js | 7 | ||||
| -rw-r--r-- | js/ui/canvas.js | 9 | ||||
| -rw-r--r-- | js/ui/controls.js | 5 |
3 files changed, 17 insertions, 4 deletions
diff --git a/js/ui/brush.js b/js/ui/brush.js index f05d6cc..730cfc0 100644 --- a/js/ui/brush.js +++ b/js/ui/brush.js @@ -68,6 +68,13 @@ var brush = (function(){ brush.contract = function(i){ this.expand(-i) } + + brush.assign = function(lex){ + brush.char = lex.char + brush.fg = lex.fg + brush.bg = lex.bg + brush.opacity = 1 + } brush.char = " " brush.fg = 0 diff --git a/js/ui/canvas.js b/js/ui/canvas.js index 67250b8..539519d 100644 --- a/js/ui/canvas.js +++ b/js/ui/canvas.js @@ -23,7 +23,14 @@ var canvas = current_canvas = (function(){ e.preventDefault() dragging = true current_canvas = canvas - if (drawing) { + console.log(e) + if (e.altKey) { + brush.assign(lex) + brush.generate() + dragging = false + return + } + else if (drawing) { draw.down(e, lex, point) } else if (selecting) { diff --git a/js/ui/controls.js b/js/ui/controls.js index fe49527..3f92b08 100644 --- a/js/ui/controls.js +++ b/js/ui/controls.js @@ -12,13 +12,12 @@ var controls = (function(){ brush.modified = false } controls.cross.generate = function(){ - var fg = brush.fg, bg = brush.bg brush.forEach(function(lex,x,y) { if ((x+y)%2) { lex.clear() } else { - lex.fill(fg,bg) + lex.assign(brush) } }) } @@ -41,7 +40,7 @@ var controls = (function(){ lex.clear() } else { - lex.fill(fg,bg) + lex.assign(brush) } }) } |