summaryrefslogtreecommitdiffstats
path: root/src/document.cpp
diff options
context:
space:
mode:
authorTavmjong Bah <tavmjong@free.fr>2015-03-11 14:01:37 +0000
committertavmjong-free <tavmjong@free.fr>2015-03-11 14:01:37 +0000
commite312688492eabdd9d4af9c6feadf3b1411f1541d (patch)
tree0bb2d856a82fdb34bbdd0ccb77d7775e22ac7675 /src/document.cpp
parentpackaging/macosx: follow-up to r13992 (forgot to add the new files for py-gob... (diff)
downloadinkscape-e312688492eabdd9d4af9c6feadf3b1411f1541d.tar.gz
inkscape-e312688492eabdd9d4af9c6feadf3b1411f1541d.zip
Allow changing document scale (via changing viewBox). Start of GUI.
(bzr r13994)
Diffstat (limited to '')
-rw-r--r--src/document.cpp24
1 files changed, 22 insertions, 2 deletions
diff --git a/src/document.cpp b/src/document.cpp
index 2a50d00bd..62e2f5b46 100644
--- a/src/document.cpp
+++ b/src/document.cpp
@@ -611,7 +611,25 @@ Inkscape::Util::Unit const& SPDocument::getSVGUnit() const
return nv ? nv->getSVGUnit() : *unit_table.getUnit("px");
}
-/// Returns document scale as defined by width/height and viewBox (real world to user-units).
+/// Sets document scale (by changing viewBox)
+void SPDocument::setDocumentScale( double scaleX, double scaleY ) {
+
+ root->viewBox = Geom::Rect::from_xywh(
+ root->viewBox.left(),
+ root->viewBox.top(),
+ root->width.computed * scaleX,
+ root->height.computed * scaleY );
+ root->viewBox_set = true;
+ root->updateRepr();
+}
+
+/// Sets document scale (by changing viewBox, x and y scaling equal)
+void SPDocument::setDocumentScale( double scale ) {
+ setDocumentScale( scale, scale );
+}
+
+/// Returns document scale as defined by width/height (in pixels) and viewBox (real world to
+/// user-units).
Geom::Scale SPDocument::getDocumentScale() const
{
Geom::Scale scale;
@@ -660,10 +678,12 @@ void SPDocument::setWidthAndHeight(const Inkscape::Util::Quantity &width, const
root->height.value = height.quantity;
root->height.unit = (SVGLength::Unit) height.unit->svgUnit();
- if (root->viewBox_set && changeSize)
+ // viewBox scaled by relative change in page size (maintains document scale).
+ if (root->viewBox_set && changeSize) {
root->viewBox.setMax(Geom::Point(
root->viewBox.left() + (root->width.value / old_width_converted ) * root->viewBox.width(),
root->viewBox.top() + (root->height.value / old_height_converted) * root->viewBox.height()));
+ }
root->updateRepr();
}