Made small improvements to small icon mode, added fixed ratio resize option for resize+shift

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@942 eee81c28-f429-11dd-99c0-75d572ba1ddd
master
Alexis Deveria 2009-11-13 15:11:48 +00:00
parent 2a9f517306
commit 5e7da751ec
3 changed files with 17 additions and 9 deletions

View File

@ -272,7 +272,7 @@ script type="text/javascript" src="locale/locale.min.js"></script-->
<!-- Zoom buttons --> <!-- Zoom buttons -->
<div id="zoom_panel" class="magic_field"> <div id="zoom_panel" class="magic_field">
<span id="zoomLabel" class="zoom_tool">zoom:</span> <span id="zoomLabel" class="zoom_tool label">zoom:</span>
<input id="zoom" class="zoom_tool" title="Change zoom level" size="3" value="100" type="text" /> <input id="zoom" class="zoom_tool" title="Change zoom level" size="3" value="100" type="text" />
<div id="zoom_dropdown" class="dropdown"> <div id="zoom_dropdown" class="dropdown">
<button></button> <button></button>
@ -386,7 +386,7 @@ script type="text/javascript" src="locale/locale.min.js"></script-->
<option>1024x768</option> <option>1024x768</option>
<option>1280x960</option> <option>1280x960</option>
<option>1600x1200</option> <option>1600x1200</option>
<option id="fitToContent" value="content">Fit to ContentFit to Content</option> <option id="fitToContent" value="content">Fit to Content</option>
</select> </select>
</label> </label>
</fieldset> </fieldset>

View File

@ -1076,7 +1076,7 @@ function svg_edit_setup() {
"div#workarea": { "div#workarea": {
'left': {s: '27px', l: '46px', xl: '65px'}, 'left': {s: '27px', l: '46px', xl: '65px'},
'top': {s: '50px', l: '88px', xl: '125px'}, 'top': {s: '50px', l: '88px', xl: '125px'},
'bottom': {s: '52px', l: '68px', xl: '75px'} 'bottom': {s: '51px', l: '68px', xl: '75px'}
}, },
"#tools_bottom": { "#tools_bottom": {
'left': {s: '27px', l: '46px', xl: '65px'}, 'left': {s: '27px', l: '46px', xl: '65px'},
@ -1088,11 +1088,12 @@ function svg_edit_setup() {
'border': {s: '1px solid #555', l: 'auto', xl: 'auto'}, 'border': {s: '1px solid #555', l: 'auto', xl: 'auto'},
'font-size': {s: '.9em', l: '2em', xl: '2.5em'} 'font-size': {s: '.9em', l: '2em', xl: '2.5em'}
}, },
"#tools_bottom input": { "#zoom_panel": {
'margin-top': {s: '6px', l: '4px', xl: '5px'}, 'margin-top': {s: '3px', l: '4px', xl: '5px'},
}, },
"#tools_bottom span, #copyright, #tools_bottom .label": { "#copyright, #tools_bottom .label": {
'font-size': {l: '1.5em', xl: '2em'} 'font-size': {l: '1.5em', xl: '2em'},
'line-height': {s: '15px'}
}, },
"#tools_bottom_2": { "#tools_bottom_2": {
'width': {l: '295px', xl: '355px'} 'width': {l: '295px', xl: '355px'}
@ -1101,7 +1102,8 @@ function svg_edit_setup() {
'line-height': {s: '17px', l: '34px', xl: '50px'} 'line-height': {s: '17px', l: '34px', xl: '50px'}
}, },
".dropdown button": { ".dropdown button": {
'height': {s: '18px', l: '34px', xl: '40px'} 'height': {s: '18px', l: '34px', xl: '40px'},
'margin-top': {s: '3px'}
}, },
"#tools_top label, #tools_bottom label": { "#tools_top label, #tools_bottom label": {
'font-size': {s: '1em', l: '1.5em', xl: '2em'}, 'font-size': {s: '1em', l: '1.5em', xl: '2em'},
@ -1112,7 +1114,7 @@ function svg_edit_setup() {
}, },
"#sidepanels": { "#sidepanels": {
'top': {s: '50px', l: '88px', xl: '125px'}, 'top': {s: '50px', l: '88px', xl: '125px'},
'bottom': {s: '52px', l: '68px', xl: '65px'}, 'bottom': {s: '51px', l: '68px', xl: '65px'},
}, },
'#layerbuttons': { '#layerbuttons': {
'width': {l: '130px', xl: '175px'}, 'width': {l: '130px', xl: '175px'},

View File

@ -2563,7 +2563,13 @@ function BatchCommand(text) {
scale = svgroot.createSVGTransform(), scale = svgroot.createSVGTransform(),
translateBack = svgroot.createSVGTransform(); translateBack = svgroot.createSVGTransform();
translateOrigin.setTranslate(-(left+tx),-(top+ty)); translateOrigin.setTranslate(-(left+tx),-(top+ty));
if(evt.shiftKey) {
if(sx == 1) sx = sy
else sy = sx;
}
scale.setScale(sx,sy); scale.setScale(sx,sy);
translateBack.setTranslate(left+tx,top+ty); translateBack.setTranslate(left+tx,top+ty);
var N = tlist.numberOfItems; var N = tlist.numberOfItems;
tlist.replaceItem(translateBack, N-3); tlist.replaceItem(translateBack, N-3);