summaryrefslogtreecommitdiffstats
path: root/src/dialogs/stroke-style.cpp
diff options
context:
space:
mode:
authorBryce Harrington <bryce@bryceharrington.org>2007-02-21 09:32:19 +0000
committerbryce <bryce@users.sourceforge.net>2007-02-21 09:32:19 +0000
commit1d29e3ba77e51174028c84be9b37fc675c32947d (patch)
tree079f8e3fed3c85cf6c4f5c885de7aa2e8bf059d3 /src/dialogs/stroke-style.cpp
parentAdding handler for switching documents, to regenerate the marker menus (diff)
downloadinkscape-1d29e3ba77e51174028c84be9b37fc675c32947d.tar.gz
inkscape-1d29e3ba77e51174028c84be9b37fc675c32947d.zip
Fixes issue where a modified stock marker's preview image appears in the
marker dropdown with the same preview image as the unmodified stock marker. This adds the source document's uri to the cache index. (bzr r2413)
Diffstat (limited to 'src/dialogs/stroke-style.cpp')
-rw-r--r--src/dialogs/stroke-style.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/dialogs/stroke-style.cpp b/src/dialogs/stroke-style.cpp
index 334b01dd1..0d22a90f7 100644
--- a/src/dialogs/stroke-style.cpp
+++ b/src/dialogs/stroke-style.cpp
@@ -619,7 +619,7 @@ sp_marker_prev_new(unsigned psize, gchar const *mname,
double sf = 0.8;
GdkPixbuf* pixbuf = NULL;
- Glib::ustring key = svg_preview_cache.cache_key(mname, psize);
+ Glib::ustring key = svg_preview_cache.cache_key(source->uri, mname, psize);
pixbuf = svg_preview_cache.get_preview_from_cache(key);
if (pixbuf == NULL) {
@@ -687,6 +687,7 @@ sp_marker_menu_build (GtkWidget *m, GSList *marker_list, SPDocument *source, SPD
gtk_widget_show(hb);
// generate preview
+
GtkWidget *prv = sp_marker_prev_new (22, markid, source, sandbox, menu_id, arena, visionkey, root);
gtk_widget_show(prv);
gtk_box_pack_start(GTK_BOX(hb), prv, FALSE, FALSE, 6);