InsetHFill drawing: some tweaks.

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

diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index a3b856dd0486daabcecd04a8abb1cc010d58aea8..dc75322e3565538dd3fc7296e6786c34b1460d5e 100644 (file)
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -649,12 +649,13 @@ void TextMetrics::computeRowMetrics(pit_type const pit,
        InsetList::const_iterator iend = par.insetList().end();
        for ( ; ii != iend; ++ii) {
                if (ii->pos >= endpos || ii->pos < row.pos()
-                       || ii->inset->lyxCode() != HFILL_CODE
-                       || !pm.hfillExpansion(row, ii->pos))
+                       || ii->inset->lyxCode() != HFILL_CODE)
                        continue;
-
                Dimension dim = row.dimension();
-               dim.wid = int(ii->pos >= body_pos ? row.hfill : row.label_hfill);
+               if (pm.hfillExpansion(row, ii->pos))
+                       dim.wid = int(ii->pos >= body_pos ? row.hfill : row.label_hfill);
+               else
+                       dim.wid = 0;
                // Cache the inset dimension. 
                bv_->coordCache().insets().add(ii->inset, dim);
                pm.setInsetDimension(ii->inset, dim);

diff --git a/src/insets/InsetHFill.cpp b/src/insets/InsetHFill.cpp
index 30980f1acd54558c56aae64cc0249dac58e696bf..cde96a05a6813175b930aa0ac67deacab32a0b24 100644 (file)
--- a/src/insets/InsetHFill.cpp
+++ b/src/insets/InsetHFill.cpp
@@ -64,7 +64,7 @@ void InsetHFill::draw(PainterInfo & pi, int x, int y) const
                // The HFill is not expanded.
                return;
 
-       int const x1 = x + dim.wid;
+       int const x1 = x + dim.wid - 2;
 
        pi.pain.line(x, y, x1, y, Color_added_space,
                frontend::Painter::line_onoffdash);