Length::inBP returns big postscript points, not pixel width

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26373 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/insets/InsetSpace.cpp b/src/insets/InsetSpace.cpp
index c84e3d6f21fd911d1bae0ee0a93ccddb41b97779..d8cea9ceaa896baf599a21afeb530df1c5bbf456 100644 (file)
--- a/src/insets/InsetSpace.cpp
+++ b/src/insets/InsetSpace.cpp
@@ -212,9 +212,11 @@ void InsetSpace::metrics(MetricsInfo & mi, Dimension & dim) const
                        break;
                case InsetSpaceParams::CUSTOM:
                case InsetSpaceParams::CUSTOM_PROTECTED: {
-                       int const minwidth = (params_.length.inBP() < 0)
-                               ? 3 * arrow_size : 4;
-                       dim.wid = max(minwidth, abs(params_.length.inBP()));
+                       int const w = 
+                               params_.length.inPixels(mi.base.textwidth,
+                                                       fm.width(char_type('M')));
+                       int const minw = (w < 0) ? 3 * arrow_size : 4;
+                       dim.wid = max(minw, abs(w));
                        break;
                }
                case InsetSpaceParams::HFILL:
@@ -237,7 +239,7 @@ void InsetSpace::draw(PainterInfo & pi, int x, int y) const
 {
        Dimension const dim = dimension(*pi.base.bv);
 
-       if (isStretchableSpace() || params_.length.inBP() < 0) {
+       if (isStretchableSpace() || params_.length.value() < 0) {
                int const asc = theFontMetrics(pi.base.font).ascent('M');
                int const desc = theFontMetrics(pi.base.font).descent('M');
                // Pixel height divisible by 2 for prettier fill graphics: