diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2015-08-26 19:35:34 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2015-08-26 19:35:34 +0000 |
| commit | 8e2a1a4407a19fc9b794c2c29cc1e6eb41c83559 (patch) | |
| tree | 062e8e1f329373a873532a746c3ef2ca81d6fc94 /src/sp-namedview.cpp | |
| parent | add 'little' comment (diff) | |
| parent | Prevent crash when "vector" doesn't exist (i.e. for mesh gradient). (diff) | |
| download | inkscape-8e2a1a4407a19fc9b794c2c29cc1e6eb41c83559.tar.gz inkscape-8e2a1a4407a19fc9b794c2c29cc1e6eb41c83559.zip | |
update to trunk
(bzr r13645.1.115)
Diffstat (limited to 'src/sp-namedview.cpp')
| -rw-r--r-- | src/sp-namedview.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp index 12c2cdf8e..b8554f352 100644 --- a/src/sp-namedview.cpp +++ b/src/sp-namedview.cpp @@ -249,6 +249,7 @@ void SPNamedView::build(SPDocument *document, Inkscape::XML::Node *repr) { //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" ); } } @@ -325,8 +326,9 @@ void SPNamedView::set(unsigned int key, const gchar* value) { } for (GSList *l = this->guides; l != NULL; l = l->next) { - //g_object_set(G_OBJECT(l->data), "color", nv->guidecolor, NULL); - SP_GUIDE(l->data)->setColor(this->guidecolor); + SPGuide * g = SP_GUIDE(l->data); + g->setColor(this->guidecolor); + g->readAttr("inkscape:color"); } this->requestModified(SP_OBJECT_MODIFIED_FLAG); @@ -336,8 +338,9 @@ void SPNamedView::set(unsigned int key, const gchar* value) { sp_nv_read_opacity(value, &this->guidecolor); for (GSList *l = this->guides; l != NULL; l = l->next) { - //g_object_set(G_OBJECT(l->data), "color", nv->guidecolor, NULL); - SP_GUIDE(l->data)->setColor(this->guidecolor); + SPGuide * g = SP_GUIDE(l->data); + g->setColor(this->guidecolor); + g->readAttr("inkscape:color"); } this->requestModified(SP_OBJECT_MODIFIED_FLAG); @@ -662,6 +665,7 @@ void SPNamedView::child_added(Inkscape::XML::Node *child, Inkscape::XML::Node *r //g_object_set(G_OBJECT(g), "color", this->guidecolor, "hicolor", this->guidehicolor, NULL); g->setColor(this->guidecolor); g->setHiColor(this->guidehicolor); + g->readAttr("inkscape:color"); if (this->editable) { for (GSList *l = this->views; l != NULL; l = l->next) { |