From 8906059a0a296f42688a86572d1713222f0b3898 Mon Sep 17 00:00:00 2001
From: Martin Vermeer <martin.vermeer@hut.fi>
Date: Sat, 1 Sep 2007 20:38:25 +0000
Subject: [PATCH] Cleanup painting of corners

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

diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp
index 58a7fd5382..d92e5d47f6 100644
--- a/src/insets/InsetCollapsable.cpp
+++ b/src/insets/InsetCollapsable.cpp
@@ -301,19 +301,23 @@ void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
 		else
 			desc -= 3;
 
-		pi.pain.line(x, y + desc - 4, x, y + desc, 
+		const int xx1 = xx + border_ - 1;
+		const int xx2 = x + dim_.wid - border_ 
+			- TEXT_TO_INSET_OFFSET + 1;
+		pi.pain.line(xx1, y + desc - 4, 
+			     xx1, y + desc, 
 			layout_.labelfont.color());
 		if (internalStatus() == Open)
-			pi.pain.line(x, y + desc, 
-				x + dim_.wid - 3, y + desc,
+			pi.pain.line(xx1, y + desc, 
+				xx2, y + desc,
 				layout_.labelfont.color());
 		else {
 			// Make status_ value visible:
-			pi.pain.line(x, y + desc,
-				x + 4, y + desc,
+			pi.pain.line(xx1, y + desc,
+				xx1 + 4, y + desc,
 				layout_.labelfont.color());
-			pi.pain.line(x + dim_.wid - 7, y + desc,
-				x + dim_.wid -3, y + desc,
+			pi.pain.line(xx2 - 4, y + desc,
+				xx2, y + desc,
 				layout_.labelfont.color());
 		}
 		pi.pain.line(x + dim_.wid - 3, y + desc, x + dim_.wid - 3, y + desc - 4,
@@ -340,11 +344,11 @@ void InsetCollapsable::draw(PainterInfo & pi, int x, int y) const
 		if (cur.isInside(this)) {
 			y -= ascent();
 			y += 3;
-			pi.pain.line(x, y + 4, x, y, layout_.labelfont.color());
-			pi.pain.line(x + 4, y, x, y, layout_.labelfont.color());
-			pi.pain.line(x + dim_.wid - 3, y + 4, x + dim_.wid - 3, y,
+			pi.pain.line(xx1, y + 4, xx1, y, layout_.labelfont.color());
+			pi.pain.line(xx1 + 4, y, xx1, y, layout_.labelfont.color());
+			pi.pain.line(xx2, y + 4, x + dim_.wid - 3, y,
 				layout_.labelfont.color());
-			pi.pain.line(x + dim_.wid - 7, y, x + dim_.wid - 3, y,
+			pi.pain.line(xx2 - 4, y, xx2, y,
 				layout_.labelfont.color());
 		}
 		break;
-- 
2.39.2