From 5c3c4207985eff57655fdcb6c52915c05e28f497 Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Thu, 20 Sep 2018 21:29:14 +0200 Subject: Fix children not properly inheriting font-size when ungrouping Only the value was merged into the child's style but not type, unit or literal specifiers. As type defaults to SP_FONT_SIZE_LITERAL with SP_CSS_FONT_SIZE_MEDIUM this resulted in removal of font-size upon ungrouping. Fixed Bugs: - https://bugs.launchpad.net/inkscape/+bug/1518575 - https://bugs.launchpad.net/inkscape/+bug/1733651 --- src/style-internal.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/style-internal.cpp') diff --git a/src/style-internal.cpp b/src/style-internal.cpp index 05257ce3a..4594b56a8 100644 --- a/src/style-internal.cpp +++ b/src/style-internal.cpp @@ -2312,6 +2312,9 @@ SPIFontSize::merge( const SPIBase* const parent ) { // Computed value same as parent set = p->set; inherit = p->inherit; + type = p->type; + unit = p->unit; + literal = p->literal; value = p->value; computed = p->computed; // Just to be sure } else if ( type == SP_FONT_SIZE_LENGTH && -- cgit v1.2.3