X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FRenderGraphic.cpp;h=e01bcd3997afe190162312005e16c48d23de8708;hb=87a7f728ca9b8b4d358cf06de980f61b67a927ac;hp=d48e4771e973e4f725aadbd8c01ace39955f5ec1;hpb=ad16347b087943741eaca30cc048e1aa32ad57c0;p=lyx.git diff --git a/src/insets/RenderGraphic.cpp b/src/insets/RenderGraphic.cpp index d48e4771e9..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 @@ -157,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); @@ -166,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()); @@ -173,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; }