* BufferParams:

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

diff --git a/src/insets/render_graphic.C b/src/insets/render_graphic.C
index 3b470bde30cf6653b3fe6fb06d4e539e24ee87b9..513b602d181edb1f71eb93852ac3996e32cf52f8 100644 (file)
--- a/src/insets/render_graphic.C
+++ b/src/insets/render_graphic.C
@@ -20,8 +20,6 @@
 #include "lyxrc.h"
 #include "metricsinfo.h"
 
-#include "frontends/Application.h"
-#include "frontends/FontLoader.h"
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
@@ -31,11 +29,10 @@
 
 #include <boost/bind.hpp>
 
-namespace graphics = lyx::graphics;
 
-using lyx::docstring;
-using lyx::support::absolutePath;
-using lyx::support::onlyFilename;
+namespace lyx {
+
+using support::onlyFilename;
 
 using std::string;
 using std::auto_ptr;
@@ -70,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_);
        }
 }
@@ -85,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;
@@ -130,8 +126,7 @@ string const statusMessage(graphics::Params const & params,
                }
        }
 
-       // FIXME UNICODE
-       return lyx::to_utf8(ret);
+       return ret;
 }
 
 
@@ -145,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,26 +156,28 @@ void RenderGraphic::metrics(MetricsInfo & mi, Dimension & dim) const
                LyXFont msgFont(mi.base.font);
                msgFont.setFamily(LyXFont::SANS_FAMILY);
 
-               string const justname = onlyFilename(params_.filename);
-               docstring djust(justname.begin(), justname.end());
+               // FIXME UNICODE
+               docstring const justname = 
+                       from_utf8(onlyFilename(params_.filename.absFilename()));
                if (!justname.empty()) {
                        msgFont.setSize(LyXFont::SIZE_FOOTNOTE);
-                       font_width = theApp->fontLoader().metrics(msgFont)
-                               .width(djust);
+                       font_width = theFontMetrics(msgFont)
+                               .width(justname);
                }
 
-               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);
-                       font_width = std::max(font_width, theApp->fontLoader()
-                               .metrics(msgFont).width(dmsg));
+                       font_width = std::max(font_width,
+                               theFontMetrics(msgFont).width(msg));
                }
 
                dim.wid = std::max(50, font_width + 15);
        }
 
+       bool const changed = dim_ != dim;
        dim_ = dim;
+       return changed;
 }
 
 
@@ -213,23 +210,24 @@ 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 - theApp->fontLoader().metrics(msgFont).maxAscent() - 4,
-                                  djust, msgFont);
+                                  y - theFontMetrics(msgFont).maxAscent() - 4,
+                                  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);
                }
        }
 }
+
+
+} // namespace lyx