mirror/piskel
1
0
Fork 0
mirror of https://github.com/piskelapp/piskel.git synced 2023-08-10 21:12:52 +03:00
Code Issues Projects Releases Wiki Activity

Checkbox crappy styling and fixing overlayproxy grid

Browse Source
This commit is contained in:
Vince 2012-09-08 23:53:59 +02:00
parent df945e10dd
commit f169a90644
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
css/tools.css
View File

@ -77,6 +77,13 @@
cursor: url(../img/tools/cursors/hand.png) 14 12, pointer; 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 { .tool-icon.selected {
cursor: auto; cursor: auto;
background-color: #eee; background-color: #eee;

11
js/controller/DrawingController.js
View File

@ -9,11 +9,6 @@
"hasGrid" : true "hasGrid" : true
}; };
// jQuery deep copy of the rendering config:
overlayRenderingOptions = $.extend(true, {}, renderingOptions);
overlayRenderingOptions.hasGrid = false;
/** /**
* @public * @public
*/ */
@ -36,7 +31,7 @@
this.overlayRenderer = new pskl.rendering.FrameRenderer( this.overlayRenderer = new pskl.rendering.FrameRenderer(
this.container, this.container,
overlayRenderingOptions, renderingOptions,
"canvas-overlay"); "canvas-overlay");
this.renderer.init(this.frame); this.renderer.init(this.frame);
@ -75,7 +70,7 @@
body.mouseup($.proxy(this.onMouseup_, this)); body.mouseup($.proxy(this.onMouseup_, this));
// Deactivate right click: // Deactivate right click:
//this.container.contextmenu(this.onCanvasContextMenu_); this.container.contextmenu(this.onCanvasContextMenu_);
}; };
/** /**
@ -152,7 +147,7 @@
this.isClicked = false; this.isClicked = false;
this.isRightClicked = false; this.isRightClicked = false;
var spriteCoordinate = this.getSpriteCoordinate(event); 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( this.currentToolBehavior.releaseToolAt(
spriteCoordinate.col, spriteCoordinate.col,
spriteCoordinate.row, spriteCoordinate.row,