From f169a90644b7fb229674b40f78d430f13053d7bd Mon Sep 17 00:00:00 2001 From: Vince Date: Sat, 8 Sep 2012 23:53:59 +0200 Subject: [PATCH] Checkbox crappy styling and fixing overlayproxy grid --- css/tools.css | 7 +++++++ js/controller/DrawingController.js | 11 +++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/css/tools.css b/css/tools.css index 7aeb3f49..6b1f308b 100644 --- a/css/tools.css +++ b/css/tools.css @@ -77,6 +77,13 @@ cursor: url(../img/tools/cursors/hand.png) 14 12, pointer; } +.tool-grid, +.tool-grid label, +.tool-grid input { + line-height: 2.5; + cursor: pointer; +} + .tool-icon.selected { cursor: auto; background-color: #eee; diff --git a/js/controller/DrawingController.js b/js/controller/DrawingController.js index c6fa5dc9..da330fab 100644 --- a/js/controller/DrawingController.js +++ b/js/controller/DrawingController.js @@ -9,11 +9,6 @@ "hasGrid" : true }; - // jQuery deep copy of the rendering config: - overlayRenderingOptions = $.extend(true, {}, renderingOptions); - overlayRenderingOptions.hasGrid = false; - - /** * @public */ @@ -36,7 +31,7 @@ this.overlayRenderer = new pskl.rendering.FrameRenderer( this.container, - overlayRenderingOptions, + renderingOptions, "canvas-overlay"); this.renderer.init(this.frame); @@ -75,7 +70,7 @@ body.mouseup($.proxy(this.onMouseup_, this)); // Deactivate right click: - //this.container.contextmenu(this.onCanvasContextMenu_); + this.container.contextmenu(this.onCanvasContextMenu_); }; /** @@ -152,7 +147,7 @@ this.isClicked = false; this.isRightClicked = false; var spriteCoordinate = this.getSpriteCoordinate(event); - console.log("mousemove: col: " + spriteCoordinate.col + " - row: " + spriteCoordinate.row); + //console.log("mousemove: col: " + spriteCoordinate.col + " - row: " + spriteCoordinate.row); this.currentToolBehavior.releaseToolAt( spriteCoordinate.col, spriteCoordinate.row,