diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-10-19 20:03:34 +0000 |
|---|---|---|
| committer | jabiertxof <info@marker.es> | 2016-10-19 20:03:34 +0000 |
| commit | fa7621c1f6ff4a7203b05f43db348e48da31d211 (patch) | |
| tree | 2a6afca2b861f72494580e72b8a79462e58516f4 /src/style.cpp | |
| parent | Styling rotate (diff) | |
| parent | Fix bug:1634641 crash on delete (diff) | |
| download | inkscape-fa7621c1f6ff4a7203b05f43db348e48da31d211.tar.gz inkscape-fa7621c1f6ff4a7203b05f43db348e48da31d211.zip | |
Update to trunk
(bzr r15142.1.18)
Diffstat (limited to 'src/style.cpp')
| -rw-r--r-- | src/style.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/style.cpp b/src/style.cpp index 930e271ad..c513b735d 100644 --- a/src/style.cpp +++ b/src/style.cpp @@ -161,6 +161,9 @@ SPStyle::SPStyle(SPDocument *document_in, SPObject *object_in) : solid_color( "solid-color" ), // SPIColor solid_opacity( "solid-opacity", SP_SCALE24_MAX ), + // Vector effects + vector_effect( "vector-effect", enum_vector_effect, SP_VECTOR_EFFECT_NONE, false ), + // Fill properties fill( "fill" ), // SPIPaint fill_opacity( "fill-opacity", SP_SCALE24_MAX ), @@ -331,6 +334,8 @@ SPStyle::SPStyle(SPDocument *document_in, SPObject *object_in) : _properties.push_back( &solid_color ); _properties.push_back( &solid_opacity ); + _properties.push_back( &vector_effect ); + _properties.push_back( &fill ); _properties.push_back( &fill_opacity ); _properties.push_back( &fill_rule ); @@ -427,6 +432,8 @@ SPStyle::SPStyle(SPDocument *document_in, SPObject *object_in) : // _propmap.insert( std::make_pair( solid_color.name, reinterpret_cast<SPIBasePtr>(&SPStyle::solid_color ) ) ); // _propmap.insert( std::make_pair( solid_opacity.name, reinterpret_cast<SPIBasePtr>(&SPStyle::solid_opacity ) ) ); + // _propmap.insert( std::make_pair( vector_effect.name, reinterpret_cast<SPIBasePtr>(&SPStyle::vector_effect ) ) ); + // _propmap.insert( std::make_pair( fill.name, reinterpret_cast<SPIBasePtr>(&SPStyle::fill ) ) ); // _propmap.insert( std::make_pair( fill_opacity.name, reinterpret_cast<SPIBasePtr>(&SPStyle::fill_opacity ) ) ); // _propmap.insert( std::make_pair( fill_rule.name, reinterpret_cast<SPIBasePtr>(&SPStyle::fill_rule ) ) ); @@ -911,6 +918,9 @@ SPStyle::readIfUnset( gint id, gchar const *val ) { case SP_PROP_SOLID_OPACITY: solid_opacity.readIfUnset( val ); break; + case SP_PROP_VECTOR_EFFECT: + vector_effect.readIfUnset( val ); + break; case SP_PROP_FILL: fill.readIfUnset( val ); break; @@ -1624,6 +1634,9 @@ sp_style_unset_property_attrs(SPObject *o) if (style->solid_opacity.set) { repr->setAttribute("solid-opacity", NULL); } + if (style->vector_effect.set) { + repr->setAttribute("vector-effect", NULL); + } if (style->fill.set) { repr->setAttribute("fill", NULL); } |