diff options
| author | Geoff Lankow <geoff@darktrojan.net> | 2015-07-11 02:25:47 +0000 |
|---|---|---|
| committer | Geoff Lankow <geoff@darktrojan.net> | 2015-07-11 02:25:47 +0000 |
| commit | c708f6f8ef412736862def24411cb1e7a86e6b27 (patch) | |
| tree | 40134b921518d50eb7839a8c823991011fcf4c65 /src | |
| parent | Read inkscape:color attribute on guides (diff) | |
| download | inkscape-c708f6f8ef412736862def24411cb1e7a86e6b27.tar.gz inkscape-c708f6f8ef412736862def24411cb1e7a86e6b27.zip | |
Read attribute after setting the default
(bzr r14228.1.2)
Diffstat (limited to 'src')
| -rw-r--r-- | src/sp-guide.cpp | 5 | ||||
| -rw-r--r-- | src/sp-namedview.cpp | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/sp-guide.cpp b/src/sp-guide.cpp index 83e723e5c..b4f4cecc0 100644 --- a/src/sp-guide.cpp +++ b/src/sp-guide.cpp @@ -71,7 +71,6 @@ void SPGuide::build(SPDocument *document, Inkscape::XML::Node *repr) { SPObject::build(document, repr); - this->readAttr( "inkscape:color" ); this->readAttr( "inkscape:label" ); this->readAttr( "orientation" ); this->readAttr( "position" ); @@ -98,7 +97,9 @@ void SPGuide::release() void SPGuide::set(unsigned int key, const gchar *value) { switch (key) { case SP_ATTR_INKSCAPE_COLOR: - this->setColor(sp_svg_read_color(value, 0x0000ff00) | 0x7f); + if (value) { + this->setColor(sp_svg_read_color(value, 0x0000ff00) | 0x7f); + } break; case SP_ATTR_INKSCAPE_LABEL: if (this->label) g_free(this->label); diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp index 1b5d9e3e2..4b9429bc1 100644 --- a/src/sp-namedview.cpp +++ b/src/sp-namedview.cpp @@ -247,7 +247,10 @@ void SPNamedView::build(SPDocument *document, Inkscape::XML::Node *repr) { SPGuide * g = SP_GUIDE(o); this->guides = g_slist_prepend(this->guides, g); //g_object_set(G_OBJECT(g), "color", nv->guidecolor, "hicolor", nv->guidehicolor, NULL); + g->setColor(this->guidecolor); g->setHiColor(this->guidehicolor); + + g->readAttr( "inkscape:color" ); } } |