From d77deb60ade63d8526ce16d0b104285411218e14 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Tue, 14 Feb 2012 13:38:56 -0800 Subject: Get color under mouse point from image or canvas. Signed-off-by: Nivesh Rajbhandari --- js/data/tools-data.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js/data/tools-data.js') diff --git a/js/data/tools-data.js b/js/data/tools-data.js index de965dbc..f63d14ae 100644 --- a/js/data/tools-data.js +++ b/js/data/tools-data.js @@ -174,7 +174,7 @@ exports.ToolsData = Montage.create(Montage, { "spriteSheet": true, "action": "EyedropperTool", "toolTip": "Eyedropper Tool", - "cursor": "url('images/tools/eyedropper_down.png'), default", + "cursor": "url('images/tools/eyedropper_down.png') 6 20, default", "lastInGroup": false, "container": false, "selected": false -- cgit v1.2.3 From bb4da39a73cbd6fbe83f3b7c9ed5ae60fe58dd6b Mon Sep 17 00:00:00 2001 From: Armen Kesablyan Date: Wed, 15 Feb 2012 14:23:19 -0800 Subject: Tool Icons : New layout Signed-off-by: Armen Kesablyan --- js/data/tools-data.js | 66 +++++++++++++++++++++++++-------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) (limited to 'js/data/tools-data.js') diff --git a/js/data/tools-data.js b/js/data/tools-data.js index de965dbc..8356c422 100644 --- a/js/data/tools-data.js +++ b/js/data/tools-data.js @@ -157,39 +157,39 @@ exports.ToolsData = Montage.create(Montage, { "container": false, "selected": false }, - { - "id": "InkBottleTool", - "properties": "inkbottleProperties", - "spriteSheet": true, - "action": "InkBottleTool", - "toolTip": "Ink Bottle Tool", - "cursor": "url('images/tools/inkbottle_down.png'), default", - "lastInGroup": false, - "container": false, - "selected": false - }, - { - "id": "EyedropperTool", - "properties": "eyedropperProperties", - "spriteSheet": true, - "action": "EyedropperTool", - "toolTip": "Eyedropper Tool", - "cursor": "url('images/tools/eyedropper_down.png'), default", - "lastInGroup": false, - "container": false, - "selected": false - }, - { - "id": "EraserTool", - "properties": "eraserProperties", - "spriteSheet": true, - "action": "EraserTool", - "toolTip": "Eraser Tool", - "cursor": "auto", - "lastInGroup": false, - "container": false, - "selected": false - }, +// { +// "id": "InkBottleTool", +// "properties": "inkbottleProperties", +// "spriteSheet": true, +// "action": "InkBottleTool", +// "toolTip": "Ink Bottle Tool", +// "cursor": "url('images/tools/inkbottle_down.png'), default", +// "lastInGroup": false, +// "container": false, +// "selected": false +// }, +// { +// "id": "EyedropperTool", +// "properties": "eyedropperProperties", +// "spriteSheet": true, +// "action": "EyedropperTool", +// "toolTip": "Eyedropper Tool", +// "cursor": "url('images/tools/eyedropper_down.png'), default", +// "lastInGroup": false, +// "container": false, +// "selected": false +// }, +// { +// "id": "EraserTool", +// "properties": "eraserProperties", +// "spriteSheet": true, +// "action": "EraserTool", +// "toolTip": "Eraser Tool", +// "cursor": "auto", +// "lastInGroup": false, +// "container": false, +// "selected": false +// }, { "id": "RotateStageTool3D", "properties": "rotateStageProperties", -- cgit v1.2.3 From 92873714dd6ffb259e6c5a27da2ade773d7b00f9 Mon Sep 17 00:00:00 2001 From: Armen Kesablyan Date: Wed, 15 Feb 2012 15:04:37 -0800 Subject: New Icons: Last set had imperfections Signed-off-by: Armen Kesablyan --- js/data/tools-data.js | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'js/data/tools-data.js') diff --git a/js/data/tools-data.js b/js/data/tools-data.js index 8356c422..4847fa7c 100644 --- a/js/data/tools-data.js +++ b/js/data/tools-data.js @@ -28,7 +28,7 @@ exports.ToolsData = Montage.create(Montage, { "action": "SubselectionTool", "toolTip": "Subselect Tool", "cursor": "auto", - "lastInGroup": false, + "lastInGroup": true, "container": false, "selected": false }, @@ -153,7 +153,7 @@ exports.ToolsData = Montage.create(Montage, { "action": "FillTool", "toolTip": "Fill Tool", "cursor": "url('images/tools/bucket_down.png'), default", - "lastInGroup": false, + "lastInGroup": true, "container": false, "selected": false }, @@ -168,17 +168,17 @@ exports.ToolsData = Montage.create(Montage, { // "container": false, // "selected": false // }, -// { -// "id": "EyedropperTool", -// "properties": "eyedropperProperties", -// "spriteSheet": true, -// "action": "EyedropperTool", -// "toolTip": "Eyedropper Tool", -// "cursor": "url('images/tools/eyedropper_down.png'), default", -// "lastInGroup": false, -// "container": false, -// "selected": false -// }, + { + "id": "EyedropperTool", + "properties": "eyedropperProperties", + "spriteSheet": true, + "action": "EyedropperTool", + "toolTip": "Eyedropper Tool", + "cursor": "url('images/tools/eyedropper_down.png'), default", + "lastInGroup": false, + "container": false, + "selected": false + }, // { // "id": "EraserTool", // "properties": "eraserProperties", @@ -219,7 +219,7 @@ exports.ToolsData = Montage.create(Montage, { "action": "ZoomTool", "toolTip": "Zoom Tool (Z)", "cursor": "url('images/cursors/zoom.png'),default", - "lastInGroup": false, + "lastInGroup": true, "container": false, "selected": false } -- cgit v1.2.3