From b4b96eb22c978024da8841f9184b1c7d85140ffd Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Thu, 5 Oct 2017 18:34:42 +0300 Subject: Extract SPDimensions from spfilters --- src/sp-dimensions.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/sp-dimensions.cpp') diff --git a/src/sp-dimensions.cpp b/src/sp-dimensions.cpp index 2eb495219..f39b98945 100644 --- a/src/sp-dimensions.cpp +++ b/src/sp-dimensions.cpp @@ -19,21 +19,26 @@ #include "sp-dimensions.h" #include "sp-item.h" -void SPDimensions::calcDimsFromParentViewport(const SPItemCtx *ictx) +void SPDimensions::calcDimsFromParentViewport(const SPItemCtx *ictx, bool assign_to_set) { +#define ASSIGN(field) { if (assign_to_set) { field._set = true; } } if (this->x.unit == SVGLength::PERCENT) { + ASSIGN(x); this->x.computed = this->x.value * ictx->viewport.width(); } if (this->y.unit == SVGLength::PERCENT) { + ASSIGN(y); this->y.computed = this->y.value * ictx->viewport.height(); } if (this->width.unit == SVGLength::PERCENT) { + ASSIGN(width); this->width.computed = this->width.value * ictx->viewport.width(); } if (this->height.unit == SVGLength::PERCENT) { + ASSIGN(height); this->height.computed = this->height.value * ictx->viewport.height(); } } -- cgit v1.2.3