summaryrefslogtreecommitdiffstats
path: root/src/sp-namedview.cpp
diff options
context:
space:
mode:
authorGeoff Lankow <geoff@darktrojan.net>2015-07-12 04:46:51 +0000
committerGeoff Lankow <geoff@darktrojan.net>2015-07-12 04:46:51 +0000
commit37450f60a28334989dd750880fa466acc90612c8 (patch)
treedd428a9b5ac8369dc541420355b6be91e35e601d /src/sp-namedview.cpp
parentRead attribute after setting the default (diff)
downloadinkscape-37450f60a28334989dd750880fa466acc90612c8.tar.gz
inkscape-37450f60a28334989dd750880fa466acc90612c8.zip
Reread guide colour after setting default colour
(bzr r14228.1.3)
Diffstat (limited to 'src/sp-namedview.cpp')
-rw-r--r--src/sp-namedview.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/sp-namedview.cpp b/src/sp-namedview.cpp
index 4b9429bc1..29c528633 100644
--- a/src/sp-namedview.cpp
+++ b/src/sp-namedview.cpp
@@ -249,7 +249,6 @@ 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" );
}
}
@@ -327,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);
@@ -338,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);