X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetminipage.C;h=9d194680131eb4296f0b88d486e4d04e0250aa81;hb=4a5b7a5952ad2381fcdf4830511293e184c7c5a1;hp=dcb8f6018b48784b97969fdf7a5a5a1546b8574e;hpb=d8037e4bfdd8524ccbf3a1fccfc9d5264644b99e;p=lyx.git diff --git a/src/insets/insetminipage.C b/src/insets/insetminipage.C index dcb8f6018b..9d19468013 100644 --- a/src/insets/insetminipage.C +++ b/src/insets/insetminipage.C @@ -327,28 +327,24 @@ int InsetMinipage::getMaxWidth(BufferView * bv, UpdatableInset const * inset) const { if (owner() && - (static_cast(owner())->getMaxWidth(bv, inset) < 0)) - { + static_cast(owner())->getMaxWidth(bv, inset) < 0) { return -1; } if (!width_.zero()) { - switch(width_.unit()) { - case LyXLength::PW: // Always % of workarea - case LyXLength::PE: - case LyXLength::PP: - case LyXLength::PL: - return (InsetCollapsable::getMaxWidth(bv, inset) * (int)width_.value()) / 100; - default: - { - int ww1 = width_.inPixels(bv); - int ww2 = InsetCollapsable::getMaxWidth(bv, inset); - if (ww2 > 0 && ww2 < ww1) { - return ww2; - } - return ww1; - } + int ww1 = latexTextWidth(bv); + int ww2 = InsetCollapsable::getMaxWidth(bv, inset); + if (ww2 > 0 && ww2 < ww1) { + return ww2; } + return ww1; } // this should not happen! return InsetCollapsable::getMaxWidth(bv, inset); } + + +int InsetMinipage::latexTextWidth(BufferView * bv) const +{ + return width_.inPixels(InsetCollapsable::latexTextWidth(bv), + bv->text->defaultHeight()); +}