github/svgedit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Made various zoom improvements, fixed zoom centering on spinner zoom

Browse Source 
git-svn-id: http://svg-edit.googlecode.com/svn/trunk@887 eee81c28-f429-11dd-99c0-75d572ba1ddd
This commit is contained in:
Alexis Deveria
2009-10-29 17:19:07 +00:00
parent fc92f6fff1
commit e960db29ff
2 changed files with 18 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
editor/svg-editor.js
View File

@@ -126,6 +126,10 @@ function svg_edit_setup() {
var scrTop = bb.y * zoomlevel; var scrTop = bb.y * zoomlevel;
var scrOffY = w_area.height()/2 - (bb.height * zoomlevel)/2; var scrOffY = w_area.height()/2 - (bb.height * zoomlevel)/2;
w_area[0].scrollTop = Math.max(0,scrTop - scrOffY) + Math.max(0,canvas_pos.top); w_area[0].scrollTop = Math.max(0,scrTop - scrOffY) + Math.max(0,canvas_pos.top);
if(svgCanvas.getMode() == 'zoom' && bb.width) {
// Go to select if a zoom box was drawn
setSelectMode();
}
} }
// updates the toolbar (colors, opacity, etc) based on the selected element // updates the toolbar (colors, opacity, etc) based on the selected element
@@ -399,9 +403,16 @@ function svg_edit_setup() {
} }
var changeZoom = function(ctl) { var changeZoom = function(ctl) {
var zoomlevel = ctl.value / 100; var zoomlevel = ctl.value / 100;
var res = svgCanvas.getResolution(); var zoom = svgCanvas.getZoom();
setResolution(res.w * zoomlevel, res.h * zoomlevel, true); var w_area = $('#workarea');
svgCanvas.setZoom(zoomlevel);
zoomChanged(window, {
width: 0,
height: 0,
x: (w_area[0].scrollLeft + w_area.width()/2)/zoom,
y: (w_area[0].scrollTop + w_area.height()/2)/zoom,
zoom: zoomlevel
});
} }
var changeOpacity = function(ctl, val) { var changeOpacity = function(ctl, val) {
@@ -598,28 +609,10 @@ function svg_edit_setup() {
addDropDown('#zoom_dropdown', function() { addDropDown('#zoom_dropdown', function() {
var item = $(this); var item = $(this);
var val = item.attr('data-val'); var val = item.attr('data-val');
var res = svgCanvas.getResolution();
var scrbar = 15;
if(val) { if(val) {
var w_area = $('#workarea'); zoomChanged(window, val);
var z_info = svgCanvas.setBBoxZoom(val, w_area.width()-scrbar, w_area.height()-scrbar);
if(!z_info) return;
var zoomlevel = z_info.zoom;
var bb = z_info.bbox;
$('#zoom').val(zoomlevel*100);
setResolution(res.w * zoomlevel, res.h * zoomlevel);
var scrLeft = bb.x * zoomlevel;
var scrOffX = w_area.width()/2 - (bb.width * zoomlevel)/2;
w_area[0].scrollLeft = Math.max(0,scrLeft - scrOffX);
var scrTop = bb.y * zoomlevel;
var scrOffY = w_area.height()/2 - (bb.height * zoomlevel)/2;
w_area[0].scrollTop = Math.max(0,scrTop - scrOffY);
} else { } else {
var percent = parseInt(item.text()); changeZoom({value:parseInt(item.text())});
$('#zoom').val(percent);
var zoomlevel = percent/100;
setResolution(res.w * zoomlevel, res.h * zoomlevel, true);
svgCanvas.setZoom(zoomlevel);
} }
}, true); }, true);
@@ -1634,9 +1627,6 @@ function svg_edit_setup() {
if(center) { if(center) {
var w_area = $('#workarea'); var w_area = $('#workarea');
// console.log(w_area[0].scrollLeft); // 1677
// console.log('w',w_area.width()); // 875 // zoom: 4.67
// Want: 1942 (+265)
var scroll_y = h/2 - w_area.height()/2; var scroll_y = h/2 - w_area.height()/2;
var scroll_x = w/2 - w_area.width()/2; var scroll_x = w/2 - w_area.width()/2;
w_area[0].scrollTop = scroll_y; w_area[0].scrollTop = scroll_y;

4
editor/svgcanvas.js
View File

@@ -4099,7 +4099,8 @@ function BatchCommand(text) {
if(typeof val == 'object') { if(typeof val == 'object') {
bb = val; bb = val;
if(bb.width == 0 || bb.height == 0) { if(bb.width == 0 || bb.height == 0) {
canvas.setZoom(current_zoom * bb.factor); var newzoom = bb.zoom?bb.zoom:current_zoom * bb.factor;
canvas.setZoom(newzoom);
return {'zoom': current_zoom, 'bbox': bb}; return {'zoom': current_zoom, 'bbox': bb};
} }
return calcZoom(bb); return calcZoom(bb);
@@ -5043,7 +5044,6 @@ function BatchCommand(text) {
var box = canvas.getBBox(elem); var box = canvas.getBBox(elem);
if (box) { if (box) {
var item = includeBBox?{'elem':elem, 'bbox':box}:elem; var item = includeBBox?{'elem':elem, 'bbox':box}:elem;
console.log('item',item);
contentElems.push(item); contentElems.push(item);
} }
} catch(e) {} } catch(e) {}