From 5fb452bf222dd2563077a5bd4eee9183fd8b33b7 Mon Sep 17 00:00:00 2001 From: buliabyak Date: Tue, 1 Apr 2008 21:29:54 +0000 Subject: [PATCH] patch by Martin von Gagern for bug 174720 --- src/style.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/style.cpp b/src/style.cpp index a50fedf6b..45a560d27 100644 --- a/src/style.cpp +++ b/src/style.cpp @@ -2125,7 +2125,9 @@ static void 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; } } -- 2.30.2