diff options
| -rw-r--r-- | css/sally.css | 4 | ||||
| -rw-r--r-- | index.html | 2 | ||||
| -rw-r--r-- | js/clipboard.js | 2 | ||||
| -rw-r--r-- | js/ui/controls.js | 6 | ||||
| -rw-r--r-- | js/vendor/colorcode.js | 4 |
5 files changed, 14 insertions, 4 deletions
diff --git a/css/sally.css b/css/sally.css index deb17cc..044c394 100644 --- a/css/sally.css +++ b/css/sally.css @@ -75,6 +75,10 @@ a:hover { text-decoration: underline } } } span,a { min-width: 8px; line-height: 15px; display: inline-block; } +.square #brush_rapper span, +.square #brush_rapper a, +.square #canvas_rapper span, +.square #canvas_rapper a { line-height: 8px; overflow: hidden; } .rapper { cursor: crosshair; } body.grid span { border-right: 1px solid #444; border-bottom: 1px solid #444; } body.grid div { border-left: 1px solid #444; } @@ -1,4 +1,3 @@ -<!-- http://jollo.org/licensing/public/LNT-1.txt --> <meta charset="UTF-8"> <link rel="stylesheet" href="css/sally.css" type="text/css" charset="utf-8" /> <link rel="stylesheet" href="css/ak.css" type="text/css" charset="utf-8" /> @@ -49,6 +48,7 @@ <span id="grid_el" class="tool">_ grid</span><br> <span id="rotate_checkbox" class="tool">_ rotate</span><br> <span id="vertical_checkbox" class="tool">_ vertical</span><br> + <span id="square_checkbox" class="tool">_ square</span><br> <br> brush size: <span id="brush_w_el" class="ed">5</span> x <span id="brush_h_el" class="ed">5</span><br> canvas size: <span id="canvas_w_el" class="ed">100</span> x <span id="canvas_h_el" class="ed">30</span><br> diff --git a/js/clipboard.js b/js/clipboard.js index fc47740..5d81f00 100644 --- a/js/clipboard.js +++ b/js/clipboard.js @@ -202,7 +202,7 @@ var clipboard = (function () { export_canvas: function (done_fn) { var opts = { palette: 'mirc', - font: 'fixedsys_8x15', + font: canvas.square ? 'fixedsys_8x8' : 'fixedsys_8x15', fg: 0, bg: 1, canvas: clipboard.canvas diff --git a/js/ui/controls.js b/js/ui/controls.js index 8eddc4e..8a20a2e 100644 --- a/js/ui/controls.js +++ b/js/ui/controls.js @@ -229,6 +229,12 @@ var controls = (function(){ canvas.resize_rapper() this.update(canvas.rotated) } + + controls.square = new BlurredCheckbox (square_checkbox) + controls.square.use = function(state){ + canvas.square = typeof state == "boolean" ? state : ! canvas.square + document.body.classList.toggle("square", canvas.square) + } // diff --git a/js/vendor/colorcode.js b/js/vendor/colorcode.js index fe90253..75940d2 100644 --- a/js/vendor/colorcode.js +++ b/js/vendor/colorcode.js @@ -307,7 +307,7 @@ for (var i=0, wh; wh=cp437s[i]; i++){ // window.cp437 = cp437; },{"../fontutil":7}],6:[function(require,module,exports){ -var fsexps = [[8,16,0],[8,15,1]] +var fsexps = [[8,16,0],[8,15,1],[8,8,5]] var fonts = {}; module.exports = fonts; @@ -358,7 +358,7 @@ for (var i=0, wh; wh=fsexps[i]; i++){ } fonts[font.name] = font } - +console.log(fonts) },{"../fontutil":7}],7:[function(require,module,exports){ var util = {}; module.exports = util; |