From: Jürgen Spitzmüller <spitz@lyx.org>
Date: Wed, 6 Jul 2005 06:56:38 +0000 (+0000)
Subject: get your ruler out, John! button insets are centered again [bug 1293]
X-Git-Tag: 1.6.10~14176
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=ed41220bb0c03c9df32f9f072cf6abff7297ddd9;p=features.git

get your ruler out, John! button insets are centered again [bug 1293]


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

diff --git a/src/ChangeLog b/src/ChangeLog
index e808f38fdb..ae5b5be792 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-06  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
+
+	* text.C (leftMargin): do not add identation to display() style
+	insets, because they are always centered (bug 1293).
+
 2005-07-05  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
 
 	* text3.C (doDispatch): rewrite LFUN_DATE_INSERT using the brandnew
diff --git a/src/text.C b/src/text.C
index b9bb9ea891..517aa19778 100644
--- a/src/text.C
+++ b/src/text.C
@@ -592,6 +592,10 @@ int LyXText::leftMargin(pit_type const pit, pos_type const pos) const
 	           && !isFirstInSequence(pit, pars_)))
 	    && align == LYX_ALIGN_BLOCK
 	    && !par.params().noindent()
+	    // display style insets are always centered, omit indentation
+	    && !(!par.empty()
+		    && par.isInset(pos)
+		    && par.getInset(pos)->display())
 	    // in charstyles, tabulars and ert paragraphs are never indented!
 	    && ((par.ownerCode() != InsetBase::TEXT_CODE || isMainText())
 	            && par.ownerCode() != InsetBase::ERT_CODE