diff --git a/css/tools.css b/css/tools.css index 86f12e5a..48abd183 100644 --- a/css/tools.css +++ b/css/tools.css @@ -15,6 +15,9 @@ background-position: 7px 7px; } +/* + * Framesheet level actions: + */ .tool-icon.tool-save { background-image: url(../img/tools/icons/save.png); } @@ -23,10 +26,18 @@ background-image: url(../img/tools/icons/add-frame.png); } + +/* + * Tool icons: + */ .tool-icon.tool-pen { background-image: url(../img/tools/icons/pen.png); } +.tool-icon.tool-vertical-mirror-pen { + background-image: url(../img/tools/icons/vertical-mirror-pen.png); +} + .tool-icon.tool-paint-bucket { background-image: url(../img/tools/icons/paint-bucket.png); } @@ -63,10 +74,18 @@ background-image: url(../img/tools/icons/color-palette.png); }*/ +/* + * Tool cursors: + */ + .tool-paint-bucket .drawing-canvas-container:hover { cursor: url(../img/tools/cursors/paint-bucket.png) 14 12, pointer; } +.tool-vertical-mirror-pen .drawing-canvas-container:hover { + cursor: url(../img/tools/cursors/vertical-mirror-pen.png) 14 12, pointer; +} + .tool-pen .drawing-canvas-container:hover { cursor: url(../img/tools/cursors/pen.png) 2 21, pointer; } diff --git a/img/tools/cursors/vertical-mirror-pen.png b/img/tools/cursors/vertical-mirror-pen.png new file mode 100644 index 00000000..cf2157d8 Binary files /dev/null and b/img/tools/cursors/vertical-mirror-pen.png differ diff --git a/img/tools/icons/mirror-pen.png b/img/tools/icons/mirror-pen.png new file mode 100644 index 00000000..f5148946 Binary files /dev/null and b/img/tools/icons/mirror-pen.png differ diff --git a/img/tools/icons/vertical-mirror-pen.png b/img/tools/icons/vertical-mirror-pen.png new file mode 100644 index 00000000..cf2157d8 Binary files /dev/null and b/img/tools/icons/vertical-mirror-pen.png differ diff --git a/index.html b/index.html index 3d126080..0e0f466a 100644 --- a/index.html +++ b/index.html @@ -110,10 +110,10 @@ - + diff --git a/js/controller/ToolController.js b/js/controller/ToolController.js index 12eca889..6553cbb6 100644 --- a/js/controller/ToolController.js +++ b/js/controller/ToolController.js @@ -6,6 +6,7 @@ this.toolInstances = { "simplePen" : new pskl.drawingtools.SimplePen(), + "verticalMirrorPen" : new pskl.drawingtools.VerticalMirrorPen(), "eraser" : new pskl.drawingtools.Eraser(), "paintBucket" : new pskl.drawingtools.PaintBucket(), "stroke" : new pskl.drawingtools.Stroke(), @@ -68,6 +69,7 @@ */ ns.ToolController.prototype.createToolMarkup_ = function() { var currentTool, toolMarkup = ''; + // TODO(vincz): Tools rendering order is not enforced by the data stucture (this.toolInstances), fix that. for (var toolKey in this.toolInstances) { currentTool = this.toolInstances[toolKey]; toolMarkup += '