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

Clean grid code: semantic names and tiny refactor using UserSettings

Browse Source
This commit is contained in:
Vince 2013-06-17 23:06:17 +02:00
parent 2691b23c09
commit 9eac3414a3
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/controller/DrawingController.js
View File

@ -19,7 +19,7 @@
// TODO(vincz): Store user prefs in a localstorage string ? // TODO(vincz): Store user prefs in a localstorage string ?
var renderingOptions = { var renderingOptions = {
"dpi": this.calculateDPI_(), "dpi": this.calculateDPI_(),
"hasGrid" : true "supportGridRendering" : true
}; };
this.renderer = new pskl.rendering.FrameRenderer(this.container, renderingOptions, "drawing-canvas"); this.renderer = new pskl.rendering.FrameRenderer(this.container, renderingOptions, "drawing-canvas");

13
js/rendering/FrameRenderer.js
View File

@ -2,27 +2,26 @@
var ns = $.namespace("pskl.rendering"); var ns = $.namespace("pskl.rendering");
ns.FrameRenderer = function (container, renderingOptions, className) { ns.FrameRenderer = function (container, renderingOptions, className) {
this.defaultRenderingOptions = { this.defaultRenderingOptions = {
"hasGrid" : false 'supportGridRendering' : false
}; };
renderingOptions = $.extend(true, {}, this.defaultRenderingOptions, renderingOptions); renderingOptions = $.extend(true, {}, this.defaultRenderingOptions, renderingOptions);
if(container === undefined) { if(container === undefined) {
throw "Bad FrameRenderer initialization. <container> undefined."; throw 'Bad FrameRenderer initialization. <container> undefined.';
} }
if(isNaN(renderingOptions.dpi)) { if(isNaN(renderingOptions.dpi)) {
throw "Bad FrameRenderer initialization. <dpi> not well defined."; throw 'Bad FrameRenderer initialization. <dpi> not well defined.';
} }
this.container = container; this.container = container;
this.dpi = renderingOptions.dpi; this.dpi = renderingOptions.dpi;
this.className = className; this.className = className;
this.canvas = null; this.canvas = null;
this.hasGrid = renderingOptions.hasGrid; this.supportGridRendering = renderingOptions.supportGridRendering;
this.gridStrokeWidth = pskl.UserSettings.get(pskl.UserSettings.SHOW_GRID) ? Constants.GRID_STROKE_WIDTH : 0; this.enableGrid(pskl.UserSettings.get(pskl.UserSettings.SHOW_GRID));
// Flag to know if the config was altered // Flag to know if the config was altered
this.canvasConfigDirty = true; this.canvasConfigDirty = true;
@ -59,6 +58,8 @@
this.gridStrokeWidth = Constants.GRID_STROKE_WIDTH; this.gridStrokeWidth = Constants.GRID_STROKE_WIDTH;
} }
ns.FrameRenderer.prototype.enableGrid = function (flag) {
this.gridStrokeWidth = (flag && this.supportGridRendering) ? Constants.GRID_STROKE_WIDTH : 0;
this.canvasConfigDirty = true; this.canvasConfigDirty = true;
}; };