* src/LyXAction.C: mark goto-clear-bookmark as working without buffer

[lyx.git] / src / insets / render_graphic.C

diff --git a/src/insets/render_graphic.C b/src/insets/render_graphic.C
index 46fc091f528078f1d17109a9e149560d1651e1f3..513b602d181edb1f71eb93852ac3996e32cf52f8 100644 (file)
--- a/src/insets/render_graphic.C
+++ b/src/insets/render_graphic.C
@@ -32,7 +32,6 @@
 
 namespace lyx {
 
-using support::absolutePath;
 using support::onlyFilename;
 
 using std::string;
@@ -68,7 +67,6 @@ void RenderGraphic::update(graphics::Params const & params)
        params_ = params;
 
        if (!params_.filename.empty()) {
-               BOOST_ASSERT(absolutePath(params_.filename));
                loader_.reset(params_.filename, params_);
        }
 }
@@ -83,7 +81,7 @@ bool displayGraphic(graphics::Params const & params)
 }
 
 
-string const statusMessage(graphics::Params const & params,
+docstring const statusMessage(graphics::Params const & params,
                           graphics::ImageStatus status)
 {
        docstring ret;
@@ -128,8 +126,7 @@ string const statusMessage(graphics::Params const & params,
                }
        }
 
-       // FIXME UNICODE
-       return to_utf8(ret);
+       return ret;
 }
 
 
@@ -143,7 +140,7 @@ bool readyToDisplay(graphics::Loader const & loader)
 } // namespace anon
 
 
-void RenderGraphic::metrics(MetricsInfo & mi, Dimension & dim) const
+bool RenderGraphic::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        bool image_ready = displayGraphic(params_) && readyToDisplay(loader_);
 
@@ -161,16 +158,14 @@ void RenderGraphic::metrics(MetricsInfo & mi, Dimension & dim) const
 
                // FIXME UNICODE
                docstring const justname = 
-                       from_utf8(onlyFilename(params_.filename));
+                       from_utf8(onlyFilename(params_.filename.absFilename()));
                if (!justname.empty()) {
                        msgFont.setSize(LyXFont::SIZE_FOOTNOTE);
                        font_width = theFontMetrics(msgFont)
                                .width(justname);
                }
 
-               // FIXME UNICODE
-               docstring const msg = 
-                       from_utf8(statusMessage(params_, loader_.status()));
+               docstring const msg = statusMessage(params_, loader_.status());
                if (!msg.empty()) {
                        msgFont.setSize(LyXFont::SIZE_TINY);
                        font_width = std::max(font_width,
@@ -180,7 +175,9 @@ void RenderGraphic::metrics(MetricsInfo & mi, Dimension & dim) const
                dim.wid = std::max(50, font_width + 15);
        }
 
+       bool const changed = dim_ != dim;
        dim_ = dim;
+       return changed;
 }
 
 
@@ -213,23 +210,21 @@ void RenderGraphic::draw(PainterInfo & pi, int x, int y) const
                // Print the file name.
                LyXFont msgFont = pi.base.font;
                msgFont.setFamily(LyXFont::SANS_FAMILY);
-               string const justname = onlyFilename(params_.filename);
+               string const justname = onlyFilename(params_.filename.absFilename());
 
                if (!justname.empty()) {
-                       docstring djust(justname.begin(), justname.end());
                        msgFont.setSize(LyXFont::SIZE_FOOTNOTE);
                        pi.pain.text(x + InsetOld::TEXT_TO_INSET_OFFSET + 6,
                                   y - theFontMetrics(msgFont).maxAscent() - 4,
-                                  djust, msgFont);
+                                  from_utf8(justname), msgFont);
                }
 
                // Print the message.
-               string const msg = statusMessage(params_, loader_.status());
+               docstring const msg = statusMessage(params_, loader_.status());
                if (!msg.empty()) {
-                       docstring dmsg(msg.begin(), msg.end());
                        msgFont.setSize(LyXFont::SIZE_TINY);
                        pi.pain.text(x + InsetOld::TEXT_TO_INSET_OFFSET + 6,
-                                    y - 4, dmsg, msgFont);
+                                    y - 4, msg, msgFont);
                }
        }
 }