From: Abdelrazak Younes <younes@lyx.org>
Date: Wed, 5 Dec 2007 22:47:14 +0000 (+0000)
Subject: InsetHFill drawing: some tweaks.
X-Git-Tag: 1.6.10~7038
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=9536a8a651a4f6301be1d5e92296bcc15272097c;p=features.git

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 a3b856dd04..dc75322e35 100644
--- 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 30980f1acd..cde96a05a6 100644
--- 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);