From b64fe15c3e67a443f184698b1a559265fcc30c71 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=BCrgen=20Vigna?= Date: Wed, 3 Oct 2001 14:28:02 +0000 Subject: [PATCH] Fixed changed-status for collapsable insets. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2836 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/BufferView_pimpl.C | 2 +- src/ChangeLog | 5 +++++ src/insets/ChangeLog | 7 +++++++ src/insets/insetcollapsable.C | 12 ++++++------ src/insets/insetert.C | 2 +- 5 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C index 0335433248..071d096d05 100644 --- a/src/BufferView_pimpl.C +++ b/src/BufferView_pimpl.C @@ -1039,7 +1039,7 @@ void BufferView::Pimpl::update(LyXText * text, BufferView::UpdateCodes f) if (text->inset_owner) { text->inset_owner->setUpdateStatus(bv_, InsetText::NONE); - updateInset(text->inset_owner, true); + updateInset(text->inset_owner, false); } else { update(); } diff --git a/src/ChangeLog b/src/ChangeLog index 2e6ccd2834..cb68d11e7f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2001-10-03 Juergen Vigna + + * BufferView_pimpl.C (update): don't change "dirty" status in + updateInset call. + 2001-10-03 Angus Leeming * WorkArea.C (c-tor): re-position version string slightly. diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index 2ac91ea1b9..d20bde7c50 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,10 @@ +2001-10-03 Juergen Vigna + + * insetert.C: ditto + + * insetcollapsable.C: change updateInset calls to not tell BV that + we have changed status. + 2001-10-01 Jean-Marc Lasgouttes * insettabular.C (deletable): make const diff --git a/src/insets/insetcollapsable.C b/src/insets/insetcollapsable.C index fae885ce60..520a6260e3 100644 --- a/src/insets/insetcollapsable.C +++ b/src/insets/insetcollapsable.C @@ -243,7 +243,7 @@ void InsetCollapsable::edit(BufferView * bv, int xp, int yp, first_after_edit = true; if (!bv->lockInset(this)) return; - bv->updateInset(this, true); + bv->updateInset(this, false); inset.edit(bv); } else { if (!bv->lockInset(this)) @@ -271,7 +271,7 @@ void InsetCollapsable::edit(BufferView * bv, bool front) if (!bv->lockInset(this)) return; inset.setUpdateStatus(bv, InsetText::FULL); - bv->updateInset(this, true); + bv->updateInset(this, false); inset.edit(bv, front); } else { if (!bv->lockInset(this)) @@ -334,11 +334,11 @@ void InsetCollapsable::insetButtonRelease(BufferView * bv, // should not be called on inset open! // inset.insetButtonRelease(bv, 0, 0, button); inset.setUpdateStatus(bv, InsetText::FULL); - bv->updateInset(this, true); + bv->updateInset(this, false); } else { collapsed_ = true; bv->unlockInset(this); - bv->updateInset(this, true); + bv->updateInset(this, false); } } else if (!collapsed_ && (y > button_bottom_y)) { LyXFont font(LyXFont::ALL_SANE); @@ -602,7 +602,7 @@ void InsetCollapsable::open(BufferView * bv) if (!collapsed_) return; collapsed_ = false; - bv->updateInset(this, true); + bv->updateInset(this, false); } @@ -612,7 +612,7 @@ void InsetCollapsable::close(BufferView * bv) const return; collapsed_ = true; - bv->updateInset(const_cast(this), true); + bv->updateInset(const_cast(this), false); } diff --git a/src/insets/insetert.C b/src/insets/insetert.C index d89d3ebf2b..6ce0971d73 100644 --- a/src/insets/insetert.C +++ b/src/insets/insetert.C @@ -560,7 +560,7 @@ void InsetERT::status(BufferView * bv, ERTStatus const st) const break; } if (bv) - bv->updateInset(const_cast(this), true); + bv->updateInset(const_cast(this), false); } } -- 2.39.2