Additional fixes to resolution change, now works correctly when zoomed
git-svn-id: http://svg-edit.googlecode.com/svn/trunk@678 eee81c28-f429-11dd-99c0-75d572ba1ddd
This commit is contained in:
@@ -1179,15 +1179,6 @@ function svg_edit_setup() {
|
|||||||
populateLayers();
|
populateLayers();
|
||||||
|
|
||||||
function changeResolution(x,y) {
|
function changeResolution(x,y) {
|
||||||
var new_res = x+'x'+y;
|
|
||||||
var found = false;
|
|
||||||
$('#resolution option').each(function() {
|
|
||||||
if($(this).text() == new_res) {
|
|
||||||
$('#resolution').val(x+'x'+y);
|
|
||||||
found = true;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
if(!found) $('#resolution').val('Custom');
|
|
||||||
var zoom = svgCanvas.getResolution().zoom;
|
var zoom = svgCanvas.getResolution().zoom;
|
||||||
setResolution(x * zoom, y * zoom);
|
setResolution(x * zoom, y * zoom);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2906,10 +2906,9 @@ function BatchCommand(text) {
|
|||||||
svgroot.setAttribute('height', y);
|
svgroot.setAttribute('height', y);
|
||||||
batchCmd.addSubCommand(new ChangeElementCommand(svgroot, {"width":w, "height":h}));
|
batchCmd.addSubCommand(new ChangeElementCommand(svgroot, {"width":w, "height":h}));
|
||||||
|
|
||||||
svgzoom.setAttribute("viewBox", ["0 0", x, y].join(' '));
|
svgzoom.setAttribute("viewBox", ["0 0", x/current_zoom, y/current_zoom].join(' '));
|
||||||
batchCmd.addSubCommand(new ChangeElementCommand(svgzoom, {"viewBox": ["0 0", w, h].join(' ')}));
|
batchCmd.addSubCommand(new ChangeElementCommand(svgzoom, {"viewBox": ["0 0", w, h].join(' ')}));
|
||||||
|
|
||||||
|
|
||||||
addCommandToHistory(batchCmd);
|
addCommandToHistory(batchCmd);
|
||||||
svgroot.unsuspendRedraw(handle);
|
svgroot.unsuspendRedraw(handle);
|
||||||
call("changed", [svgzoom]);
|
call("changed", [svgzoom]);
|
||||||
|
|||||||
Reference in New Issue
Block a user