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 e808f38fdb0d8276cf216dd0cacc92656e355ac1..ae5b5be7929030d2c13e4a9292be7f2e86d8bdc6 100644 (file)
--- 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 b9bb9ea891d4883d83fac7db2d3f5bcb2ac2e4cd..517aa197781661f3c6e9d7aef4bb0ebd8f39309b 100644 (file)
--- 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