summaryrefslogtreecommitdiffstats
path: root/src/sp-image.cpp
diff options
context:
space:
mode:
authorShlomi Fish <shlomif@shlomifish.org>2017-10-05 14:33:06 +0000
committerShlomi Fish <shlomif@shlomifish.org>2017-10-05 14:33:06 +0000
commit3eae8aa890673270d0907d55395ccaf5368cea37 (patch)
treef3bcf182667a4621131f06c34222d7c7b57160f2 /src/sp-image.cpp
parentExtract SPRoot::setRootDimensions . (diff)
downloadinkscape-3eae8aa890673270d0907d55395ccaf5368cea37.tar.gz
inkscape-3eae8aa890673270d0907d55395ccaf5368cea37.zip
Extract a base class, SPDimensions.
From two places getting rid of duplicate code.
Diffstat (limited to 'src/sp-image.cpp')
-rw-r--r--src/sp-image.cpp17
1 files changed, 1 insertions, 16 deletions
diff --git a/src/sp-image.cpp b/src/sp-image.cpp
index 1961971cb..6736efdec 100644
--- a/src/sp-image.cpp
+++ b/src/sp-image.cpp
@@ -374,23 +374,8 @@ void SPImage::update(SPCtx *ctx, unsigned int flags) {
}
}
-
// Calculate x, y, width, height from parent/initial viewport, see sp-root.cpp
- if (this->x.unit == SVGLength::PERCENT) {
- this->x.computed = this->x.value * ictx->viewport.width();
- }
-
- if (this->y.unit == SVGLength::PERCENT) {
- this->y.computed = this->y.value * ictx->viewport.height();
- }
-
- if (this->width.unit == SVGLength::PERCENT) {
- this->width.computed = this->width.value * ictx->viewport.width();
- }
-
- if (this->height.unit == SVGLength::PERCENT) {
- this->height.computed = this->height.value * ictx->viewport.height();
- }
+ this->calcDimsFromParentViewport(ictx);
// Image creates a new viewport
ictx->viewport= Geom::Rect::from_xywh( this->x.computed, this->y.computed,