diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2018-03-15 08:38:23 +0000 |
|---|---|---|
| committer | Tavmjong Bah <tavmjong@free.fr> | 2018-03-15 08:38:23 +0000 |
| commit | 1620d3898b165bbe37ce9baf5503252100e42b7d (patch) | |
| tree | 9842b568bad60785d42ba5d8ed27788b611eeeac /src/desktop-style.cpp | |
| parent | Code cleanup. (diff) | |
| download | inkscape-1620d3898b165bbe37ce9baf5503252100e42b7d.tar.gz inkscape-1620d3898b165bbe37ce9baf5503252100e42b7d.zip | |
Add 'font-variation-settings' to style query.
Diffstat (limited to 'src/desktop-style.cpp')
| -rw-r--r-- | src/desktop-style.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp index 3b80d0e9e..a5cc75d15 100644 --- a/src/desktop-style.cpp +++ b/src/desktop-style.cpp @@ -1252,10 +1252,11 @@ objects_query_fontstyle (const std::vector<SPItem*> &objects, SPStyle *style_res texts ++; if (set && - ( ( style_res->font_weight.computed != style->font_weight.computed ) || - ( style_res->font_style.computed != style->font_style.computed ) || - ( style_res->font_stretch.computed != style->font_stretch.computed ) || - ( style_res->font_variant.computed != style->font_variant.computed ) ) ) { + ( ( style_res->font_weight.computed != style->font_weight.computed ) || + ( style_res->font_style.computed != style->font_style.computed ) || + ( style_res->font_stretch.computed != style->font_stretch.computed ) || + ( style_res->font_variant.computed != style->font_variant.computed ) || + ( style_res->font_variation_settings != style->font_variation_settings ) ) ) { different = true; // different styles } @@ -1264,6 +1265,7 @@ objects_query_fontstyle (const std::vector<SPItem*> &objects, SPStyle *style_res style_res->font_style.value = style_res->font_style.computed = style->font_style.computed; style_res->font_stretch.value = style_res->font_stretch.computed = style->font_stretch.computed; style_res->font_variant.value = style_res->font_variant.computed = style->font_variant.computed; + style_res->font_variation_settings = style->font_variation_settings; style_res->text_align.value = style_res->text_align.computed = style->text_align.computed; style_res->font_size.value = style->font_size.value; style_res->font_size.unit = style->font_size.unit; |