X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FRenderGraphic.cpp;h=e01bcd3997afe190162312005e16c48d23de8708;hb=131f4b92bac3ecb75b47c266dfa3d8543bd4d578;hp=7ab14cb63f6fdb5deacc913d83b5c212a944118c;hpb=244de5d2c10a990828eafdd72283fc87742dc133;p=lyx.git diff --git a/src/insets/RenderGraphic.cpp b/src/insets/RenderGraphic.cpp index 7ab14cb63f..e01bcd3997 100644 --- 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); @@ -165,6 +167,7 @@ void RenderGraphic::metrics(MetricsInfo & mi, Dimension & dim) const if (!justname.empty()) { msgFont.setSize(FONT_SIZE_FOOTNOTE); font_width = theFontMetrics(msgFont).width(justname); + font_height = theFontMetrics(msgFont).maxHeight(); } docstring const msg = statusMessage(params_, loader_.status()); @@ -172,9 +175,12 @@ void RenderGraphic::metrics(MetricsInfo & mi, Dimension & dim) const msgFont.setSize(FONT_SIZE_TINY); 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; }