Fix not updating of paragaph dialog in some cases (fix #229).

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

diff --git a/src/ChangeLog b/src/ChangeLog
index c3af7757ed802aa0cd49b8fb4f59cd872d517c82..462151efaa5f514bbf6e13a832515ca846cc0764 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-19  Juergen Vigna  <jug@sad.it>
+
+       * lyxfunc.C (dispatch): update paragraph layout after LFUN_ESCAPE when
+       really leaving an inset.
+
 2002-04-18  Juergen Vigna  <jug@sad.it>
 
        * BufferView_pimpl.C (Dispatch): fixed to change layout also if one

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index c39ebb390678d8c1a91f2339385acb3b2cc8a6a4..1fc287ca898088cb7a2f967eebbcd47bb8d4c798 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,9 @@
+2002-04-19  Juergen Vigna  <jug@sad.it>
+
+       * FormParagraph.C (changedParagraph): don't check for p == par_ as
+       we don't set par_ on a changedParagraph call so we don't resete the
+       buttons and message when we return to the original paragraph!
+
 2002-04-17  Rob Lahaye <lahaye@users.sourceforge.net>
 
        * forms/cvsignore: add Makefile.

diff --git a/src/frontends/xforms/FormParagraph.C b/src/frontends/xforms/FormParagraph.C
index 2aa378b7e2dcf2b980a44d71582c1fc41329c170..9362d925a4161adf7782915056ec5500dcd89d9e 100644 (file)
--- a/src/frontends/xforms/FormParagraph.C
+++ b/src/frontends/xforms/FormParagraph.C
@@ -77,7 +77,7 @@ void FormParagraph::changedParagraph()
 {
        /// Record the paragraph
        Paragraph const * const p = getCurrentParagraph();
-       if (p == 0 || p == par_)
+       if (p == 0) // this is wrong as we don't set par_ here! /* || p == par_) */
                return;
 
        // For now, don't bother checking if the params are different.

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index bf587bfe0feb6bf7309fc0c34b28d77ea99ae139..52c39549fb9594b5ef330fc00d55cb2b6633c209 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -1021,6 +1021,8 @@ string const LyXFunc::dispatch(kb_action action, string argument)
                                                        true);
                        }
                        finishUndo();
+                       // Tell the paragraph dialog that we changed paragraph
+                       owner->getDialogs()->updateParagraph();
                }
        }
        break;