From 504dceda6b4e75f259393dc755a383d21fca5e6c Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Fri, 13 Mar 2015 10:07:12 -0700 Subject: [PATCH 1/2] Update edit.js icons --- examples/edit.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/edit.js b/examples/edit.js index c236336266..e7c8c897ac 100644 --- a/examples/edit.js +++ b/examples/edit.js @@ -126,7 +126,7 @@ var toolBar = (function () { // Hide active button for now - this may come back, so not deleting yet. activeButton = toolBar.addTool({ - imageURL: toolIconUrl + "models-tool.svg", + imageURL: toolIconUrl + "edit-status.svg", subImage: { x: 0, y: Tool.IMAGE_WIDTH, width: Tool.IMAGE_WIDTH, height: Tool.IMAGE_HEIGHT }, width: toolWidth, height: toolHeight, @@ -135,7 +135,7 @@ var toolBar = (function () { }, true, false); newModelButton = toolBar.addTool({ - imageURL: toolIconUrl + "add-model-tool.svg", + imageURL: toolIconUrl + "upload.svg", subImage: { x: 0, y: Tool.IMAGE_WIDTH, width: Tool.IMAGE_WIDTH, height: Tool.IMAGE_HEIGHT }, width: toolWidth, height: toolHeight, @@ -144,7 +144,7 @@ var toolBar = (function () { }); browseModelsButton = toolBar.addTool({ - imageURL: toolIconUrl + "list-icon.svg", + imageURL: toolIconUrl + "marketplace.svg", width: toolWidth, height: toolHeight, alpha: 0.9, From e94bac1971f3fc5e84324de22578b60f8fc0c0ca Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Fri, 13 Mar 2015 10:07:31 -0700 Subject: [PATCH 2/2] Fix subimage indexing in toolBars.js --- examples/libraries/toolBars.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/libraries/toolBars.js b/examples/libraries/toolBars.js index 951b6704ec..670a69dec7 100644 --- a/examples/libraries/toolBars.js +++ b/examples/libraries/toolBars.js @@ -94,7 +94,7 @@ Tool = function(properties, selectable, selected) { // selectable and selected a } selected = doSelect; - properties.subImage.y = (selected ? 2 : 1) * properties.subImage.height; + properties.subImage.y = (selected ? 0 : 1) * properties.subImage.height; Overlays.editOverlay(this.overlay(), { subImage: properties.subImage }); } this.toggle = function() { @@ -102,7 +102,7 @@ Tool = function(properties, selectable, selected) { // selectable and selected a return; } selected = !selected; - properties.subImage.y = (selected ? 2 : 1) * properties.subImage.height; + properties.subImage.y = (selected ? 0 : 1) * properties.subImage.height; Overlays.editOverlay(this.overlay(), { subImage: properties.subImage }); return selected;