summaryrefslogtreecommitdiffstats
path: root/src/style-internal.cpp
diff options
context:
space:
mode:
authorEduard Braun <eduard.braun2@gmx.de>2018-09-20 19:29:14 +0000
committerEduard Braun <eduard.braun2@gmx.de>2018-09-20 19:29:14 +0000
commit5c3c4207985eff57655fdcb6c52915c05e28f497 (patch)
treecfbc3b1cf36d805bab7dfeac6f5c0e021dbe47f5 /src/style-internal.cpp
parentflip transform dialog icons (diff)
downloadinkscape-5c3c4207985eff57655fdcb6c52915c05e28f497.tar.gz
inkscape-5c3c4207985eff57655fdcb6c52915c05e28f497.zip
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
Diffstat (limited to 'src/style-internal.cpp')
-rw-r--r--src/style-internal.cpp3
1 files changed, 3 insertions, 0 deletions
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 &&