Properly terminate command

[lyx.git] / src / insets / RenderGraphic.cpp

diff --git a/src/insets/RenderGraphic.cpp b/src/insets/RenderGraphic.cpp
index 7ab14cb63f6fdb5deacc913d83b5c212a944118c..e48a0fa391c4ffc64126a62ed43b8f06996aa1b1 100644 (file)
--- a/src/insets/RenderGraphic.cpp
+++ b/src/insets/RenderGraphic.cpp
@@ -132,7 +132,7 @@ bool readyToDisplay(graphics::Loader const & loader)
        return loader.image()->isDrawable();
 }
 
-} // namespace anon
+} // namespace
 
 
 void RenderGraphic::metrics(MetricsInfo & mi, Dimension & dim) const
@@ -142,6 +142,7 @@ void RenderGraphic::metrics(MetricsInfo & mi, Dimension & dim) const
                        loader_.startLoading();
                if (!loader_.monitoring())
                        loader_.startMonitoring();
+               loader_.checkModifiedAsync();
        }
 
        bool const image_ready = displayGraphic(params_) && readyToDisplay(loader_);
@@ -156,6 +157,7 @@ void RenderGraphic::metrics(MetricsInfo & mi, Dimension & dim) const
        dim.des = 0;
 
        int font_width = 0;
+       int font_height = 0;
 
        FontInfo msgFont(mi.base.font);
        msgFont.setFamily(SANS_FAMILY);
@@ -163,18 +165,22 @@ void RenderGraphic::metrics(MetricsInfo & mi, Dimension & dim) const
        // FIXME UNICODE
        docstring const justname = from_utf8(params_.filename.onlyFileName());
        if (!justname.empty()) {
-               msgFont.setSize(FONT_SIZE_FOOTNOTE);
+               msgFont.setSize(FOOTNOTE_SIZE);
                font_width = theFontMetrics(msgFont).width(justname);
+               font_height = theFontMetrics(msgFont).maxHeight();
        }
 
        docstring const msg = statusMessage(params_, loader_.status());
        if (!msg.empty()) {
-               msgFont.setSize(FONT_SIZE_TINY);
+               msgFont.setSize(TINY_SIZE);
                font_width = max(font_width,
                        theFontMetrics(msgFont).width(msg));
+               font_height += theFontMetrics(msgFont).maxAscent();
+               dim.des = theFontMetrics(msgFont).maxDescent();
        }
 
        dim.wid = max(50, font_width + 15);
+       dim.asc = max(50, font_height + 15);
 
        dim_ = dim;
 }
@@ -203,7 +209,7 @@ void RenderGraphic::draw(PainterInfo & pi, int x, int y) const
                string const justname = params_.filename.onlyFileName();
 
                if (!justname.empty()) {
-                       msgFont.setSize(FONT_SIZE_FOOTNOTE);
+                       msgFont.setSize(FOOTNOTE_SIZE);
                        pi.pain.text(x1 + 6, y - theFontMetrics(msgFont).maxAscent() - 4,
                                     from_utf8(justname), msgFont);
                }
@@ -211,7 +217,7 @@ void RenderGraphic::draw(PainterInfo & pi, int x, int y) const
                // Print the message.
                docstring const msg = statusMessage(params_, loader_.status());
                if (!msg.empty()) {
-                       msgFont.setSize(FONT_SIZE_TINY);
+                       msgFont.setSize(TINY_SIZE);
                        pi.pain.text(x1 + 6, y - 4, msg, msgFont);
                }
        }