From e33e3dd815986134b9e9ae136b03c22921b881fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Uwe=20St=C3=B6hr?= <uwestoehr@web.de>
Date: Tue, 14 Sep 2010 23:24:57 +0000
Subject: [PATCH] InsetLine.cpp: restore the drawing routine after r35373, see
 http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg161800.html

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35374 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/insets/InsetLine.cpp | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/insets/InsetLine.cpp b/src/insets/InsetLine.cpp
index fa3395bac4..a0110c7a14 100644
--- a/src/insets/InsetLine.cpp
+++ b/src/insets/InsetLine.cpp
@@ -14,8 +14,6 @@
 #include "InsetLine.h"
 
 #include "Buffer.h"
-#include "BufferView.h"
-#include "CoordCache.h"
 #include "Dimension.h"
 #include "DispatchResult.h"
 #include "FuncRequest.h"
@@ -129,22 +127,20 @@ void InsetLine::metrics(MetricsInfo & mi, Dimension & dim) const
 
 void InsetLine::draw(PainterInfo & pi, int x, int y) const
 {
-	// We cannot use InsetCommand::dimension() as this returns the dimension
-	// of the button, which is not used here!
-	Dimension const dim = pi.base.bv->coordCache().getInsets().dim(this);
-	int const max_width = dim.width();
-
 	frontend::FontMetrics const & fm = theFontMetrics(pi.base.font);
 
 	// get the length of the parameters in pixels
 	Length offset = Length(to_ascii(getParam("offset")));
-	int o = offset.inPixels(max_width,
-				fm.width(char_type('M')));
-	Length const width(to_ascii(getParam("width")));
-	int w = width.inPixels(max_width,
+	int o =
+		offset.inPixels(pi.base.textwidth,
+		fm.width(char_type('M')));
+	Length width = Length(to_ascii(getParam("width")));
+	int w =
+		width.inPixels(pi.base.textwidth,
 		fm.width(char_type('M')));
 	Length height = Length(to_ascii(getParam("height")));
-	int h = height.inPixels(max_width,
+	int h =
+		height.inPixels(pi.base.textwidth,
 		fm.width(char_type('M')));
 
 	// get the surrounding text color
@@ -153,14 +149,14 @@ void InsetLine::draw(PainterInfo & pi, int x, int y) const
 
 	// assure that the drawn line is not outside of the window
 	// check that it doesn't exceed the outer boundary
-	if (w > max_width)
-		w = max_width;
+	if (x + w - h/2 - 2 > pi.base.textwidth)
+		w = pi.base.textwidth - x + h/2 + 2;
 	// check that it doesn't exceed the upper boundary
 	if (y - o - h/2 < 0)
 		o = y - h/2 - 2;
 
 	// the offset is a vertical one
-	pi.pain.line(x, y - o - h/2, x + w, y - o - h/2,
+	pi.pain.line(x + h/2 + 1, y - o - h/2, x + w - h/2 - 2, y - o - h/2,
 		Line_color, Painter::line_solid, float(h));
 }