summaryrefslogtreecommitdiffstats
path: root/src/display/drawing-image.cpp
diff options
context:
space:
mode:
authorMartin Owens <doctormo@gmail.com>2014-04-19 04:54:21 +0000
committerMartin Owens <doctormo@gmail.com>2014-04-19 04:54:21 +0000
commitcf5e023e643edc8ac79a125ea61aefe22703aee8 (patch)
tree0fef0ac4ca957ae0405c01a1bc84e8564fb5e857 /src/display/drawing-image.cpp
parentLatvian translation update (diff)
parentFix remaining issue with prefs updating (diff)
downloadinkscape-cf5e023e643edc8ac79a125ea61aefe22703aee8.tar.gz
inkscape-cf5e023e643edc8ac79a125ea61aefe22703aee8.zip
Merge in outline bitmap image preference feature
(bzr r13292)
Diffstat (limited to 'src/display/drawing-image.cpp')
-rw-r--r--src/display/drawing-image.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/display/drawing-image.cpp b/src/display/drawing-image.cpp
index 5844c8b08..00caef525 100644
--- a/src/display/drawing-image.cpp
+++ b/src/display/drawing-image.cpp
@@ -106,7 +106,10 @@ unsigned DrawingImage::_renderItem(DrawingContext &dc, Geom::IntRect const &/*ar
{
bool outline = _drawing.outline();
- if (!outline) {
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ bool imgoutline = prefs->getBool("/options/rendering/imageinoutlinemode", false);
+
+ if (!outline || imgoutline) {
if (!_pixbuf) return RENDER_OK;
Inkscape::DrawingContext::Save save(dc);
@@ -141,7 +144,7 @@ unsigned DrawingImage::_renderItem(DrawingContext &dc, Geom::IntRect const &/*ar
dc.paint(_opacity);
} else { // outline; draw a rect instead
- Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+
guint32 rgba = prefs->getInt("/options/wireframecolors/images", 0xff0000ff);
{ Inkscape::DrawingContext::Save save(dc);