Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 23:16:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4444 from huffman/update-edit-icons

Browse source 
Update edit icons
This commit is contained in:
Stephen Birarda 2015-03-13 11:05:25 -07:00
commit 8a6de53ede
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
examples/edit.js
View file

@ -126,7 +126,7 @@ var toolBar = (function () {
// Hide active button for now - this may come back, so not deleting yet. // Hide active button for now - this may come back, so not deleting yet.
activeButton = toolBar.addTool({ 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 }, subImage: { x: 0, y: Tool.IMAGE_WIDTH, width: Tool.IMAGE_WIDTH, height: Tool.IMAGE_HEIGHT },
width: toolWidth, width: toolWidth,
height: toolHeight, height: toolHeight,
@ -135,7 +135,7 @@ var toolBar = (function () {
}, true, false); }, true, false);
newModelButton = toolBar.addTool({ 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 }, subImage: { x: 0, y: Tool.IMAGE_WIDTH, width: Tool.IMAGE_WIDTH, height: Tool.IMAGE_HEIGHT },
width: toolWidth, width: toolWidth,
height: toolHeight, height: toolHeight,
@ -144,7 +144,7 @@ var toolBar = (function () {
}); });
browseModelsButton = toolBar.addTool({ browseModelsButton = toolBar.addTool({
imageURL: toolIconUrl + "list-icon.svg", imageURL: toolIconUrl + "marketplace.svg",
width: toolWidth, width: toolWidth,
height: toolHeight, height: toolHeight,
alpha: 0.9, alpha: 0.9,

4
examples/libraries/toolBars.js
View file

@ -94,7 +94,7 @@ Tool = function(properties, selectable, selected) { // selectable and selected a
} }
selected = doSelect; 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 }); Overlays.editOverlay(this.overlay(), { subImage: properties.subImage });
} }
this.toggle = function() { this.toggle = function() {
@ -102,7 +102,7 @@ Tool = function(properties, selectable, selected) { // selectable and selected a
return; return;
} }
selected = !selected; 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 }); Overlays.editOverlay(this.overlay(), { subImage: properties.subImage });
return selected; return selected;