diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2014-10-02 14:57:04 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2014-10-02 14:57:04 +0000 |
| commit | dd9c5a5779119c79a1f31b69dd3f0fa25abc513c (patch) | |
| tree | dad1d2d9a860040e04db53ae8e40c1ab42ecd589 /src/desktop-style.cpp | |
| parent | update to trunk (r13564) (diff) | |
| parent | Work-around for Pango 1.36.7 which introduced 'Semi-Light' font weight, (diff) | |
| download | inkscape-dd9c5a5779119c79a1f31b69dd3f0fa25abc513c.tar.gz inkscape-dd9c5a5779119c79a1f31b69dd3f0fa25abc513c.zip | |
update to trunk (r13577)
(bzr r13506.1.108)
Diffstat (limited to 'src/desktop-style.cpp')
| -rw-r--r-- | src/desktop-style.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp index bfd662c9a..0b2e15d34 100644 --- a/src/desktop-style.cpp +++ b/src/desktop-style.cpp @@ -40,7 +40,6 @@ #include "sp-tspan.h" #include "xml/repr.h" #include "xml/sp-css-attr.h" -#include "libnrtype/font-style-to-pos.h" #include "sp-path.h" #include "ui/tools/tool-base.h" @@ -1098,7 +1097,10 @@ objects_query_fontstyle (GSList *objects, SPStyle *style_res) texts ++; if (set && - font_style_to_pos(*style_res).signature() != font_style_to_pos(*style).signature() ) { + ( ( 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 ) ) ) { different = true; // different styles } |