* 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 d940d782da21114ad87320e3234f20aa2932302b..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_);
        }
 }
@@ -142,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_);
 
@@ -160,7 +158,7 @@ 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)
@@ -177,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;
 }
 
 
@@ -210,7 +210,7 @@ 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()) {
                        msgFont.setSize(LyXFont::SIZE_FOOTNOTE);