From 0b0238d9046adf9be2b49437589d0dc6ecd67c30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Vigna?= Date: Fri, 19 Apr 2002 10:51:06 +0000 Subject: [PATCH] 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 --- src/ChangeLog | 5 +++++ src/frontends/xforms/ChangeLog | 6 ++++++ src/frontends/xforms/FormParagraph.C | 2 +- src/lyxfunc.C | 2 ++ 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index c3af7757ed..462151efaa 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2002-04-19 Juergen Vigna + + * lyxfunc.C (dispatch): update paragraph layout after LFUN_ESCAPE when + really leaving an inset. + 2002-04-18 Juergen Vigna * BufferView_pimpl.C (Dispatch): fixed to change layout also if one diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index c39ebb3906..1fc287ca89 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,9 @@ +2002-04-19 Juergen Vigna + + * 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 * forms/cvsignore: add Makefile. diff --git a/src/frontends/xforms/FormParagraph.C b/src/frontends/xforms/FormParagraph.C index 2aa378b7e2..9362d925a4 100644 --- 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 bf587bfe0f..52c39549fb 100644 --- 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;