eyedropper improvements
Mark MacKay
parent
0459d1ff03
commit
681810750d
|
|
@ -31,21 +31,8 @@ svgEditor.addExtension("eyedropper", function(S) {
|
|||
// if we are in eyedropper mode, we don't want to disable the eye-dropper tool
|
||||
var mode = svgCanvas.getMode();
|
||||
if (mode == "eyedropper") return;
|
||||
|
||||
var elem = null;
|
||||
var tool = $('#tool_eyedropper');
|
||||
|
||||
if (opts.elems[0] &&
|
||||
$.inArray(opts.elems[0].nodeName, ['svg', 'g', 'use']) == -1)
|
||||
{
|
||||
elem = opts.elems[0];
|
||||
tool.removeClass('disabled');
|
||||
}
|
||||
// disable eye-dropper tool
|
||||
else {
|
||||
tool.addClass('disabled');
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
var getPaint = function(color, opac, type) {
|
||||
|
|
@ -84,8 +71,8 @@ svgEditor.addExtension("eyedropper", function(S) {
|
|||
id: "tool_eyedropper",
|
||||
type: "mode",
|
||||
title: "Eye Dropper Tool",
|
||||
position: 8,
|
||||
key: "I",
|
||||
"class": "disabled",
|
||||
icon: "extensions/eyedropper.png",
|
||||
events: {
|
||||
"click": function() {
|
||||
|
|
@ -94,10 +81,6 @@ svgEditor.addExtension("eyedropper", function(S) {
|
|||
}
|
||||
}],
|
||||
|
||||
|
||||
// if we have selected an element, grab its paint and enable the eye dropper button
|
||||
selectedChanged: getStyle,
|
||||
elementChanged: getStyle,
|
||||
mouseDown: function(opts) {
|
||||
var mode = svgCanvas.getMode();
|
||||
var e = opts.event;
|
||||
|
|
@ -112,6 +95,14 @@ svgEditor.addExtension("eyedropper", function(S) {
|
|||
currentStyle.strokeLinecap = target.getAttribute("stroke-linecap");
|
||||
currentStyle.strokeLinejoin = target.getAttribute("stroke-linejoin");
|
||||
currentStyle.opacity = target.getAttribute("opacity") || 1.0;
|
||||
opts.selectedElements = opts.selectedElements.filter(Boolean)
|
||||
if (!opts.selectedElements.length) { //nothing selected, just update colors
|
||||
var fill = getPaint(currentStyle.fillPaint, currentStyle.fillOpacity*100, "fill");
|
||||
var stroke = getPaint(currentStyle.strokePaint, currentStyle.strokeOpacity*100, "stroke");
|
||||
svgEditor.paintBox.fill.setPaint(fill)
|
||||
svgEditor.paintBox.stroke.setPaint(stroke)
|
||||
return;
|
||||
}
|
||||
if ($.inArray(opts.selectedElements.nodeName, ['g', 'use']) == -1) {
|
||||
var changes = {};
|
||||
var change = function(elem, attrname, newvalue) {
|
||||
|
|
|
|||
|
|
@ -429,6 +429,15 @@
|
|||
svgCanvas.setMode('select');
|
||||
};
|
||||
|
||||
var setEyedropperMode = function() {
|
||||
var curr = $('.tool_button_current');
|
||||
if(curr.length && curr[0].id !== 'tool_eyedropper') {
|
||||
curr.removeClass('tool_button_current').addClass('tool_button');
|
||||
$('#tool_eyedropper').addClass('tool_button_current').removeClass('tool_button');
|
||||
}
|
||||
svgCanvas.setMode('eyedropper');
|
||||
}
|
||||
|
||||
var togglePathEditMode = function(editmode, elems) {
|
||||
$('#path_node_panel').toggle(editmode);
|
||||
$('#tools_bottom_2,#tools_bottom_3').toggle(!editmode);
|
||||
|
|
@ -1105,7 +1114,7 @@
|
|||
sel: '#'+id,
|
||||
fn: btn.events.click,
|
||||
icon: btn.id,
|
||||
// key: btn.key,
|
||||
//key: btn.key,
|
||||
isDefault: true
|
||||
}, ref_data];
|
||||
|
||||
|
|
@ -3337,6 +3346,7 @@
|
|||
{key: ['alt+shift+left', true], fn: function(){svgCanvas.cloneSelectedElements(-10,0)}},
|
||||
{key: ['alt+shift+right', true], fn: function(){svgCanvas.cloneSelectedElements(10,0)}},
|
||||
{key: modKey + 'A', fn: function(){svgCanvas.selectAllInCurrentLayer();}},
|
||||
{key: 'I', fn: function(){setEyedropperMode()}},
|
||||
|
||||
// Standard shortcuts
|
||||
{key: modKey + 'shift+z', fn: clickRedo},
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -31,21 +31,8 @@ svgEditor.addExtension("eyedropper", function(S) {
|
|||
// if we are in eyedropper mode, we don't want to disable the eye-dropper tool
|
||||
var mode = svgCanvas.getMode();
|
||||
if (mode == "eyedropper") return;
|
||||
|
||||
var elem = null;
|
||||
var tool = $('#tool_eyedropper');
|
||||
|
||||
if (opts.elems[0] &&
|
||||
$.inArray(opts.elems[0].nodeName, ['svg', 'g', 'use']) == -1)
|
||||
{
|
||||
elem = opts.elems[0];
|
||||
tool.removeClass('disabled');
|
||||
}
|
||||
// disable eye-dropper tool
|
||||
else {
|
||||
tool.addClass('disabled');
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
var getPaint = function(color, opac, type) {
|
||||
|
|
@ -84,8 +71,8 @@ svgEditor.addExtension("eyedropper", function(S) {
|
|||
id: "tool_eyedropper",
|
||||
type: "mode",
|
||||
title: "Eye Dropper Tool",
|
||||
position: 8,
|
||||
key: "I",
|
||||
"class": "disabled",
|
||||
icon: "extensions/eyedropper.png",
|
||||
events: {
|
||||
"click": function() {
|
||||
|
|
@ -94,10 +81,6 @@ svgEditor.addExtension("eyedropper", function(S) {
|
|||
}
|
||||
}],
|
||||
|
||||
|
||||
// if we have selected an element, grab its paint and enable the eye dropper button
|
||||
selectedChanged: getStyle,
|
||||
elementChanged: getStyle,
|
||||
mouseDown: function(opts) {
|
||||
var mode = svgCanvas.getMode();
|
||||
var e = opts.event;
|
||||
|
|
@ -112,6 +95,14 @@ svgEditor.addExtension("eyedropper", function(S) {
|
|||
currentStyle.strokeLinecap = target.getAttribute("stroke-linecap");
|
||||
currentStyle.strokeLinejoin = target.getAttribute("stroke-linejoin");
|
||||
currentStyle.opacity = target.getAttribute("opacity") || 1.0;
|
||||
opts.selectedElements = opts.selectedElements.filter(Boolean)
|
||||
if (!opts.selectedElements.length) { //nothing selected, just update colors
|
||||
var fill = getPaint(currentStyle.fillPaint, currentStyle.fillOpacity*100, "fill");
|
||||
var stroke = getPaint(currentStyle.strokePaint, currentStyle.strokeOpacity*100, "stroke");
|
||||
svgEditor.paintBox.fill.setPaint(fill)
|
||||
svgEditor.paintBox.stroke.setPaint(stroke)
|
||||
return;
|
||||
}
|
||||
if ($.inArray(opts.selectedElements.nodeName, ['g', 'use']) == -1) {
|
||||
var changes = {};
|
||||
var change = function(elem, attrname, newvalue) {
|
||||
|
|
|
|||
|
|
@ -429,6 +429,15 @@
|
|||
svgCanvas.setMode('select');
|
||||
};
|
||||
|
||||
var setEyedropperMode = function() {
|
||||
var curr = $('.tool_button_current');
|
||||
if(curr.length && curr[0].id !== 'tool_eyedropper') {
|
||||
curr.removeClass('tool_button_current').addClass('tool_button');
|
||||
$('#tool_eyedropper').addClass('tool_button_current').removeClass('tool_button');
|
||||
}
|
||||
svgCanvas.setMode('eyedropper');
|
||||
}
|
||||
|
||||
var togglePathEditMode = function(editmode, elems) {
|
||||
$('#path_node_panel').toggle(editmode);
|
||||
$('#tools_bottom_2,#tools_bottom_3').toggle(!editmode);
|
||||
|
|
@ -1105,7 +1114,7 @@
|
|||
sel: '#'+id,
|
||||
fn: btn.events.click,
|
||||
icon: btn.id,
|
||||
// key: btn.key,
|
||||
//key: btn.key,
|
||||
isDefault: true
|
||||
}, ref_data];
|
||||
|
||||
|
|
@ -3337,6 +3346,7 @@
|
|||
{key: ['alt+shift+left', true], fn: function(){svgCanvas.cloneSelectedElements(-10,0)}},
|
||||
{key: ['alt+shift+right', true], fn: function(){svgCanvas.cloneSelectedElements(10,0)}},
|
||||
{key: modKey + 'A', fn: function(){svgCanvas.selectAllInCurrentLayer();}},
|
||||
{key: 'I', fn: function(){setEyedropperMode()}},
|
||||
|
||||
// Standard shortcuts
|
||||
{key: modKey + 'shift+z', fn: clickRedo},
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue