summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9f43852)
raw | patch | inline | side by side (parent: 9f43852)
author | buliabyak <buliabyak@users.sourceforge.net> | |
Tue, 1 Apr 2008 21:29:54 +0000 (21:29 +0000) | ||
committer | buliabyak <buliabyak@users.sourceforge.net> | |
Tue, 1 Apr 2008 21:29:54 +0000 (21:29 +0000) |
src/style.cpp | patch | blob | history |
diff --git a/src/style.cpp b/src/style.cpp
index a50fedf6b673ec6abcb842c92d0d518abb5d020a..45a560d272db8a1f2de20433b7438660164d5c35 100644 (file)
--- a/src/style.cpp
+++ b/src/style.cpp
sp_style_merge_ipaint(SPStyle *style, SPIPaint *paint, SPIPaint const *parent)
{
if ((paint->set && paint->currentcolor) || parent->currentcolor) {
+ bool isset = paint->set;
paint->clear();
+ paint->set = isset;
paint->currentcolor = TRUE;
paint->setColor(style->color.value.color);
return;
@@ -3016,6 +3018,7 @@ sp_style_read_icolor(SPIPaint *paint, gchar const *str, SPStyle *style, SPDocume
guint32 const rgb0 = sp_svg_read_color(str, 0xff);
if (rgb0 != 0xff) {
paint->setColor(rgb0);
+ paint->set = TRUE;
paint->inherit = FALSE;
}
}