summaryrefslogtreecommitdiffstats
path: root/src/style.cpp
diff options
context:
space:
mode:
authorMartin Owens <doctormo@gmail.com>2018-11-12 16:24:24 +0000
committerMartin Owens <doctormo@gmail.com>2018-11-12 16:24:24 +0000
commit74125bd2086346aa8c645c55600b16c66f154114 (patch)
tree79121ec5b0f262f6b459e72e5a96a2b658469ae0 /src/style.cpp
parentRename add_style_sheet to reduce confusion with SVG/CSS (diff)
parentExplicitly stop inheritance of 'stop-color' per SVG spec. (diff)
downloadinkscape-74125bd2086346aa8c645c55600b16c66f154114.tar.gz
inkscape-74125bd2086346aa8c645c55600b16c66f154114.zip
Merge branch 'master' of gitlab.com:inkscape/inkscape
Diffstat (limited to 'src/style.cpp')
-rw-r--r--src/style.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/style.cpp b/src/style.cpp
index 1d1ce797f..529b9bb0a 100644
--- a/src/style.cpp
+++ b/src/style.cpp
@@ -388,11 +388,11 @@ SPStyle::SPStyle(SPDocument *document_in, SPObject *object_in) :
color_rendering( "color-rendering", enum_color_rendering, SP_CSS_COLOR_RENDERING_AUTO),
image_rendering( "image-rendering", enum_image_rendering, SP_CSS_IMAGE_RENDERING_AUTO),
shape_rendering( "shape-rendering", enum_shape_rendering, SP_CSS_SHAPE_RENDERING_AUTO),
- text_rendering( "text-rendering", enum_text_rendering, SP_CSS_TEXT_RENDERING_AUTO ),
+ text_rendering( "text-rendering", enum_text_rendering, SP_CSS_TEXT_RENDERING_AUTO ),
// Stop color and opacity
- stop_color("stop-color"),
- stop_opacity("stop-opacity", SP_SCALE24_MAX)
+ stop_color("stop-color", false), // SPIColor, does not inherit
+ stop_opacity("stop-opacity", SP_SCALE24_MAX, false) // Does not inherit
{
// std::cout << "SPStyle::SPStyle( SPDocument ): Entrance: (" << _count << ")" << std::endl;
// std::cout << " Document: " << (document_in?"present":"null") << std::endl;