anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 05:25:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove "deep update"

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7501 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2003-08-05 08:07:07 +00:00
parent 7fa13a8b8f
commit 340b7d232c
30 changed files with 120 additions and 223 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/BufferView.C
View File

@ -552,9 +552,9 @@ int BufferView::unlockInset(UpdatableInset * inset)
}
void BufferView::updateInset(InsetOld * inset)
void BufferView::updateInset()
{
pimpl_->updateInset(inset);
pimpl_->updateInset();
}

2
src/BufferView.h
View File

@ -75,7 +75,7 @@ public:
/// perform pending painting updates
void update();
/// update for a particular inset
void updateInset(InsetOld * inset);
void updateInset();
/// reset the scrollbar to reflect current view position
void updateScrollbar();
/// FIXME

43
src/BufferView_pimpl.C
View File

@ -1174,7 +1174,7 @@ bool BufferView::Pimpl::dispatch(FuncRequest const & ev_in)
case LFUN_INSET_INSERT: {
InsetOld * inset = createInset(ev);
if (inset && insertInset(inset)) {
updateInset(inset);
updateInset();
string const name = ev.getArg(0);
if (name == "bibitem") {
@ -1370,46 +1370,13 @@ bool BufferView::Pimpl::insertInset(InsetOld * inset, string const & lout)
}
void BufferView::Pimpl::updateInset(InsetOld * inset)
void BufferView::Pimpl::updateInset()
{
if (!inset || !available())
if (!available())
return;
// first check for locking insets
if (bv_->theLockingInset()) {
if (bv_->theLockingInset() == inset) {
if (bv_->text->updateInset(inset)) {
// this should not be needed, but it is...
bv_->text->redoParagraph(bv_->text->cursor.par());
update();
updateScrollbar();
return;
}
} else if (bv_->theLockingInset()->updateInsetInInset(bv_, inset)) {
if (bv_->text->updateInset(bv_->theLockingInset())) {
update();
updateScrollbar();
return;
}
}
}
// then check if the inset is a top_level inset (has no owner)
// if yes do the update as always otherwise we have to update the
// toplevel inset where this inset is inside
InsetOld * tl_inset = inset;
while (tl_inset->owner())
tl_inset = tl_inset->owner();
if (tl_inset == inset) {
update();
if (bv_->text->updateInset(inset)) {
update();
return;
}
} else if (static_cast<UpdatableInset *>(tl_inset)
->updateInsetInInset(bv_, inset))
{
if (bv_->text->updateInset(tl_inset)) {
update();
updateScrollbar();
}
}
}

2
src/BufferView_pimpl.h
View File

@ -95,7 +95,7 @@ struct BufferView::Pimpl : public boost::signals::trackable {
///
bool insertInset(InsetOld * inset, string const & lout = string());
///
void updateInset(InsetOld * inset);
void updateInset();
/// a function should be executed from the workarea
bool workAreaDispatch(FuncRequest const & ev);
/// a function should be executed

8
src/ChangeLog
View File

@ -1,4 +1,12 @@
2003-08-05 André Pönitz <poenitz@gmx.net>
* BufferView.[Ch]:
* BufferView_pimpl.[Ch]:
* bufferview_funcs.C:
* text2.C:
* text3.C: rip out "deep update"
2003-08-04 André Pönitz <poenitz@gmx.net>
* BufferView.[Ch]:

4
src/bufferview_funcs.C
View File

@ -221,11 +221,11 @@ void number(BufferView * bv)
void lang(BufferView * bv, string const & l)
{
LyXFont font(LyXFont::ALL_IGNORE);
Language const * lang = languages.getLanguage(l);
if (!lang)
return;
LyXFont font(LyXFont::ALL_IGNORE);
font.setLanguage(lang);
toggleAndShow(bv, font);
}
@ -241,7 +241,7 @@ bool changeDepth(BufferView * bv, LyXText * text, DEPTH_CHANGE type, bool test_o
bool const changed = text->changeDepth(type, false);
if (text->inset_owner)
bv->updateInset((InsetOld *)text->inset_owner);
bv->updateInset();
bv->update();
return changed;
}

2
src/graphics/PreviewedInset.C
View File

@ -125,7 +125,7 @@ void PreviewedInset::imageReady(PreviewImage const & pimage) const
pimage_ = &pimage;
if (view())
view()->updateInset(&inset_);
view()->updateInset();
}
} // namespace graphics

18
src/insets/ChangeLog
View File

@ -1,4 +1,22 @@
2003-08-05 André Pönitz <poenitz@gmx.net>
* insetbibitem.C:
* insetcollapsable.[Ch]:
* insetcommand.C:
* insetert.C:
* insetexternal.C:
* insetfloat.C:
* insetgraphics.C:
* insetinclude.C:
* insetlabel.C:
* insetminipage.C:
* insetnote.C:
* insettabular.[Ch]:
* insettext.[Ch]:
* insetwrap.C:
* updatableinset.[Ch]: rip out "deep update"
2003-08-04 André Pönitz <poenitz@gmx.net>
* insettext.[Ch] (updateLocal): remove 'what' argument by assuimng it

5
src/insets/insetbibitem.C
View File

@ -40,8 +40,7 @@ InsetBibitem::InsetBibitem(InsetCommandParams const & p)
InsetBibitem::~InsetBibitem()
{
InsetCommandMailer mailer("bibitem", *this);
mailer.hideDialog();
InsetCommandMailer("bibitem", *this).hideDialog();
}
@ -67,7 +66,7 @@ dispatch_result InsetBibitem::localDispatch(FuncRequest const & cmd)
if (p.getCmdName().empty())
return DISPATCHED;
setParams(p);
cmd.view()->updateInset(this);
cmd.view()->updateInset();
cmd.view()->fitCursor();
return DISPATCHED;
}

36
src/insets/insetcollapsable.C
View File

@ -210,7 +210,7 @@ void InsetCollapsable::insetUnlock(BufferView * bv)
inset.insetUnlock(bv);
if (scroll())
scroll(bv, 0.0F);
bv->updateInset(this);
bv->updateInset();
}
@ -229,25 +229,22 @@ void InsetCollapsable::lfunMouseRelease(FuncRequest const & cmd)
if (collapsed_ && cmd.button() != mouse_button::button3) {
collapsed_ = false;
bv->updateInset(this);
bv->updateInset();
bv->buffer()->markDirty();
return;
}
if (cmd.button() != mouse_button::button3 && hitButton(cmd))
{
if (cmd.button() != mouse_button::button3 && hitButton(cmd)) {
if (collapsed_) {
collapsed_ = false;
bv->updateInset(this);
bv->buffer()->markDirty();
} else {
collapsed_ = true;
bv->unlockInset(this);
bv->updateInset(this);
bv->buffer()->markDirty();
}
} else if (!collapsed_ && (cmd.y > button_dim.y2)) {
ret = (inset.localDispatch(adjustCommand(cmd)) == DISPATCHED);
bv->updateInset();
bv->buffer()->markDirty();
} else if (!collapsed_ && cmd.y > button_dim.y2) {
ret = inset.localDispatch(adjustCommand(cmd)) == DISPATCHED;
}
if (cmd.button() == mouse_button::button3 && !ret)
showInsetDialog(bv);
@ -298,7 +295,7 @@ InsetOld::RESULT InsetCollapsable::localDispatch(FuncRequest const & cmd)
lyxerr << "branch collapsed_" << endl;
collapsed_ = false;
if (bv->lockInset(this)) {
bv->updateInset(this);
bv->updateInset();
bv->buffer()->markDirty();
inset.localDispatch(cmd);
first_after_edit = true;
@ -326,7 +323,7 @@ InsetOld::RESULT InsetCollapsable::localDispatch(FuncRequest const & cmd)
first_after_edit = true;
if (!bv->lockInset(this))
return DISPATCHED;
bv->updateInset(this);
bv->updateInset();
bv->buffer()->markDirty();
inset.localDispatch(cmd);
} else {
@ -386,14 +383,6 @@ bool InsetCollapsable::unlockInsetInInset(BufferView * bv, UpdatableInset * in,
}
bool InsetCollapsable::updateInsetInInset(BufferView * bv, InsetOld *in)
{
if (in == this)
return true;
return inset.updateInsetInInset(bv, in);
}
int InsetCollapsable::insetInInsetY() const
{
return inset.insetInInsetY() - (top_baseline - inset.y());
@ -501,10 +490,11 @@ InsetOld * InsetCollapsable::getInsetFromID(int id_arg) const
void InsetCollapsable::open(BufferView * bv)
{
if (!collapsed_) return;
if (!collapsed_)
return;
collapsed_ = false;
bv->updateInset(this);
bv->updateInset();
}
@ -514,7 +504,7 @@ void InsetCollapsable::close(BufferView * bv) const
return;
collapsed_ = true;
bv->updateInset(const_cast<InsetCollapsable *>(this));
bv->updateInset();
}

2
src/insets/insetcollapsable.h
View File

@ -73,8 +73,6 @@ public:
bool unlockInsetInInset(BufferView *, UpdatableInset *,
bool lr = false);
///
bool updateInsetInInset(BufferView *, InsetOld *);
///
int insetInInsetY() const;
///
RESULT localDispatch(FuncRequest const &);

2
src/insets/insetcommand.C
View File

@ -102,7 +102,7 @@ dispatch_result InsetCommand::localDispatch(FuncRequest const & cmd)
return UNDISPATCHED;
setParams(p);
cmd.view()->updateInset(this);
cmd.view()->updateInset();
return DISPATCHED;
}

4
src/insets/insetert.C
View File

@ -454,7 +454,7 @@ InsetOld::RESULT InsetERT::localDispatch(FuncRequest const & cmd)
* taken by the text).
*/
inset.getLyXText(cmd.view())->fullRebreak();
bv->updateInset(this);
bv->updateInset();
result = DISPATCHED;
}
break;
@ -598,7 +598,7 @@ void InsetERT::status(BufferView * bv, ERTStatus const st) const
break;
}
if (bv) {
bv->updateInset(const_cast<InsetERT *>(this));
bv->updateInset();
bv->buffer()->markDirty();
}
}

4
src/insets/insetexternal.C
View File

@ -127,7 +127,7 @@ void InsetExternal::statusChanged()
{
BufferView * bv = renderer_->view();
if (bv)
bv->updateInset(this);
bv->updateInset();
}
@ -152,7 +152,7 @@ dispatch_result InsetExternal::localDispatch(FuncRequest const & cmd)
InsetExternal::Params p;
InsetExternalMailer::string2params(cmd.argument, *buffer, p);
setParams(p, buffer);
cmd.view()->updateInset(this);
cmd.view()->updateInset();
return DISPATCHED;
}

26
src/insets/insetfloat.C
View File

@ -162,9 +162,8 @@ InsetFloat::~InsetFloat()
dispatch_result InsetFloat::localDispatch(FuncRequest const & cmd)
{
InsetOld::RESULT result = UNDISPATCHED;
switch (cmd.action) {
case LFUN_INSET_MODIFY: {
InsetFloatParams params;
InsetFloatMailer::string2params(cmd.argument, params);
@ -173,22 +172,18 @@ dispatch_result InsetFloat::localDispatch(FuncRequest const & cmd)
params_.wide = params.wide;
wide(params_.wide, cmd.view()->buffer()->params);
cmd.view()->updateInset(this);
result = DISPATCHED;
cmd.view()->updateInset();
return DISPATCHED;
}
break;
case LFUN_INSET_DIALOG_UPDATE: {
InsetFloatMailer mailer(*this);
mailer.updateDialog(cmd.view());
InsetFloatMailer(*this).updateDialog(cmd.view());
return DISPATCHED;
}
break;
default:
result = InsetCollapsable::localDispatch(cmd);
return InsetCollapsable::localDispatch(cmd);
}
return result;
}
@ -197,14 +192,13 @@ void InsetFloatParams::write(ostream & os) const
os << "Float " // getInsetName()
<< type << '\n';
if (!placement.empty()) {
if (!placement.empty())
os << "placement " << placement << "\n";
}
if (wide) {
if (wide)
os << "wide true\n";
} else {
else
os << "wide false\n";
}
}

4
src/insets/insetgraphics.C
View File

@ -169,7 +169,7 @@ void InsetGraphics::statusChanged()
{
BufferView * bv = graphic_->view();
if (bv)
bv->updateInset(this);
bv->updateInset();
}
@ -182,7 +182,7 @@ dispatch_result InsetGraphics::localDispatch(FuncRequest const & cmd)
InsetGraphicsMailer::string2params(cmd.argument, buffer, p);
if (!p.filename.empty()) {
setParams(p);
cmd.view()->updateInset(this);
cmd.view()->updateInset();
}
return DISPATCHED;
}

4
src/insets/insetinclude.C
View File

@ -138,7 +138,7 @@ dispatch_result InsetInclude::localDispatch(FuncRequest const & cmd)
if (!p.cparams.getCmdName().empty()) {
set(p);
params_.masterFilename_ = cmd.view()->buffer()->fileName();
cmd.view()->updateInset(this);
cmd.view()->updateInset();
}
return DISPATCHED;
}
@ -601,7 +601,7 @@ void InsetInclude::PreviewImpl::restartLoading()
lyxerr << "restartLoading()" << std::endl;
removePreview();
if (view())
view()->updateInset(&parent());
view()->updateInset();
generatePreview();
}

11
src/insets/insetlabel.C
View File

@ -59,7 +59,7 @@ dispatch_result InsetLabel::localDispatch(FuncRequest const & cmd)
case LFUN_INSET_EDIT:
InsetCommandMailer("label", *this).showDialog(cmd.view());
result = DISPATCHED;
return DISPATCHED;
break;
case LFUN_INSET_MODIFY: {
@ -75,16 +75,13 @@ dispatch_result InsetLabel::localDispatch(FuncRequest const & cmd)
}
setParams(p);
cmd.view()->updateInset(this);
result = DISPATCHED;
cmd.view()->updateInset();
return DISPATCHED;
}
break;
default:
result = InsetCommand::localDispatch(cmd);
return InsetCommand::localDispatch(cmd);
}
return result;
}

5
src/insets/insetminipage.C
View File

@ -103,8 +103,7 @@ auto_ptr<InsetBase> InsetMinipage::clone() const
InsetMinipage::~InsetMinipage()
{
InsetMinipageMailer mailer(*this);
mailer.hideDialog();
InsetMinipageMailer(*this).hideDialog();
}
@ -121,7 +120,7 @@ dispatch_result InsetMinipage::localDispatch(FuncRequest const & cmd)
/* FIXME: I refuse to believe we have to live
* with ugliness like this ... */
inset.getLyXText(cmd.view())->fullRebreak();
cmd.view()->updateInset(this);
cmd.view()->updateInset();
return DISPATCHED;
}

14
src/insets/insetnote.C
View File

@ -122,28 +122,32 @@ dispatch_result InsetNote::localDispatch(FuncRequest const & cmd)
BufferView * bv = cmd.view();
switch (cmd.action) {
case LFUN_INSET_MODIFY:
{
case LFUN_INSET_MODIFY: {
InsetNoteParams params;
InsetNoteMailer::string2params(cmd.argument, params);
params_.type = params.type;
setButtonLabel();
bv->updateInset(this);
bv->updateInset();
return DISPATCHED;
}
case LFUN_INSET_EDIT:
if (cmd.button() != mouse_button::button3)
return InsetCollapsable::localDispatch(cmd);
if (cmd.button() == mouse_button::button3)
return UNDISPATCHED;
return InsetCollapsable::localDispatch(cmd);
case LFUN_INSET_DIALOG_UPDATE:
InsetNoteMailer("note", *this).updateDialog(bv);
return DISPATCHED;
case LFUN_MOUSE_RELEASE:
if (cmd.button() == mouse_button::button3 && hitButton(cmd)) {
InsetNoteMailer("note", *this).showDialog(bv);
return DISPATCHED;
}
// fallthrough:
default:
return InsetCollapsable::localDispatch(cmd);
}

31
src/insets/insettabular.C
View File

@ -436,7 +436,7 @@ void InsetTabular::updateLocal(BufferView * bv, UpdateCodes what) const
need_update = what;
// Dirty Cast! (Lgb)
if (need_update != NONE) {
bv->updateInset(const_cast<InsetTabular *>(this));
bv->updateInset();
if (locked)
resetPos(bv);
}
@ -516,25 +516,6 @@ bool InsetTabular::unlockInsetInInset(BufferView * bv, UpdatableInset * inset,
}
bool InsetTabular::updateInsetInInset(BufferView * bv, InsetOld * inset)
{
InsetOld * tl_inset = inset;
// look if this inset is really inside myself!
while (tl_inset->owner() && tl_inset->owner() != this)
tl_inset = tl_inset->owner();
// if we enter here it's not ower inset
if (!tl_inset->owner())
return false;
// we only have to do this if this is a subinset of our cells
if (tl_inset != inset) {
if (!static_cast<InsetText *>(tl_inset)->updateInsetInInset(bv, inset))
return false;
}
updateLocal(bv, CELL);
return true;
}
int InsetTabular::insetInInsetY() const
{
if (!the_locking_inset)
@ -592,16 +573,6 @@ void InsetTabular::lfunMousePress(FuncRequest const & cmd)
if (actrow != orow)
updateLocal(bv, NONE);
clearSelection();
#if 0
if (cmd.button() == mouse_button::button3) {
if ((ocell != actcell) && the_locking_inset) {
the_locking_inset->insetUnlock(bv);
updateLocal(bv, CELL);
the_locking_inset = 0;
}
return;
}
#endif
bool const inset_hit = insetHit(bv, cmd.x, cmd.y);

2
src/insets/insettabular.h
View File

@ -96,8 +96,6 @@ public:
bool unlockInsetInInset(BufferView *, UpdatableInset *,
bool lr = false);
///
bool updateInsetInInset(BufferView *, InsetOld *);
///
int insetInInsetY() const;
///
UpdatableInset * getLockingInset() const;

43
src/insets/insettext.C
View File

@ -368,8 +368,7 @@ void InsetText::drawFrame(Painter & pain, int x) const
frame_y = top_baseline - dim_.asc + ttoD2;
frame_w = dim_.wid - TEXT_TO_INSET_OFFSET;
frame_h = dim_.asc + dim_.des - TEXT_TO_INSET_OFFSET;
pain.rectangle(frame_x, frame_y, frame_w, frame_h,
frame_color);
pain.rectangle(frame_x, frame_y, frame_w, frame_h, frame_color);
}
@ -389,7 +388,7 @@ void InsetText::updateLocal(BufferView * bv, bool mark_dirty)
bv->fitCursor();
if (flag)
bv->updateInset(const_cast<InsetText *>(this));
bv->updateInset();
bv->owner()->view_state_changed();
bv->owner()->updateMenubar();
@ -547,44 +546,6 @@ bool InsetText::unlockInsetInInset(BufferView * bv, UpdatableInset * inset,
}
bool InsetText::updateInsetInInset(BufferView * bv, InsetOld * inset)
{
if (!autoBreakRows && paragraphs.size() > 1)
collapseParagraphs(bv);
if (inset == this)
return true;
if (inset->owner() != this) {
bool found = false;
UpdatableInset * tl_inset = the_locking_inset;
if (tl_inset)
found = tl_inset->updateInsetInInset(bv, inset);
if (!found) {
tl_inset = static_cast<UpdatableInset *>(inset);
while(tl_inset->owner() && tl_inset->owner() != this)
tl_inset = static_cast<UpdatableInset *>(tl_inset->owner());
if (!tl_inset->owner())
return false;
found = tl_inset->updateInsetInInset(bv, inset);
} else {
text_.updateInset(tl_inset);
}
return found;
}
bool found = text_.updateInset(inset);
if (found) {
if (the_locking_inset &&
cpar() == inset_par && cpos() == inset_pos)
{
inset_x = cix() - top_x + drawTextXOffset;
inset_y = ciy() + drawTextYOffset;
}
}
return found;
}
void InsetText::lfunMousePress(FuncRequest const & cmd)
{
no_selection = true;

2
src/insets/insettext.h
View File

@ -84,8 +84,6 @@ public:
bool unlockInsetInInset(BufferView *,
UpdatableInset *, bool lr = false);
///
bool updateInsetInInset(BufferView *, InsetOld *);
///
RESULT localDispatch(FuncRequest const &);
///
int latex(Buffer const *, std::ostream &,

9
src/insets/insetwrap.C
View File

@ -91,7 +91,7 @@ dispatch_result InsetWrap::localDispatch(FuncRequest const & cmd)
params_.placement = params.placement;
params_.width = params.width;
cmd.view()->updateInset(this);
cmd.view()->updateInset();
return DISPATCHED;
}
@ -107,12 +107,11 @@ dispatch_result InsetWrap::localDispatch(FuncRequest const & cmd)
void InsetWrapParams::write(ostream & os) const
{
os << "Wrap " // getInsetName()
<< type << '\n';
os << "Wrap " << type << '\n';
if (!placement.empty()) {
if (!placement.empty())
os << "placement " << placement << "\n";
}
os << "width \"" << width.asString() << "\"\n";
}

2
src/insets/updatableinset.C
View File

@ -125,7 +125,7 @@ InsetOld::RESULT UpdatableInset::localDispatch(FuncRequest const & ev)
int const xx = strToInt(ev.argument);
scroll(ev.view(), xx);
}
ev.view()->updateInset(this);
ev.view()->updateInset();
return DISPATCHED;
}

3
src/insets/updatableinset.h
View File

@ -78,9 +78,6 @@ public:
///
virtual int insetInInsetY() const { return 0; }
///
virtual bool updateInsetInInset(BufferView *, InsetOld *)
{ return false; }
///
virtual bool lockInsetInInset(BufferView *, UpdatableInset *)
{ return false; }
///

20
src/mathed/formulabase.C
View File

@ -156,12 +156,12 @@ void InsetFormulaBase::insetUnlock(BufferView * bv)
if (mathcursor) {
if (mathcursor->inMacroMode()) {
mathcursor->macroModeClose();
bv->updateInset(this);
bv->updateInset();
}
releaseMathCursor(bv);
}
generatePreview();
bv->updateInset(this);
bv->updateInset();
}
@ -207,7 +207,7 @@ void InsetFormulaBase::fitInsetCursor(BufferView * bv) const
void InsetFormulaBase::toggleInsetSelection(BufferView * bv)
{
if (mathcursor)
bv->updateInset(this);
bv->updateInset();
}
@ -217,7 +217,7 @@ dispatch_result InsetFormulaBase::lfunMouseRelease(FuncRequest const & cmd)
return UNDISPATCHED;
BufferView * bv = cmd.view();
bv->updateInset(this);
bv->updateInset();
//lyxerr << "lfunMouseRelease: buttons: " << cmd.button() << endl;
if (cmd.button() == mouse_button::button3) {
@ -236,7 +236,7 @@ dispatch_result InsetFormulaBase::lfunMouseRelease(FuncRequest const & cmd)
mathcursor->selClear();
mathcursor->setPos(cmd.x + xo_, cmd.y + yo_);
mathcursor->insert(ar);
bv->updateInset(this);
bv->updateInset();
return DISPATCHED;
}
@ -283,7 +283,7 @@ dispatch_result InsetFormulaBase::lfunMousePress(FuncRequest const & cmd)
return DISPATCHED;
}
bv->updateInset(this);
bv->updateInset();
return DISPATCHED;
}
@ -311,7 +311,7 @@ dispatch_result InsetFormulaBase::lfunMouseMotion(FuncRequest const & cmd)
BufferView * bv = cmd.view();
mathcursor->setPos(cmd.x + xo_, cmd.y + yo_);
bv->updateInset(this);
bv->updateInset();
return DISPATCHED;
}
@ -345,7 +345,7 @@ dispatch_result InsetFormulaBase::localDispatch(FuncRequest const & cmd)
}
// if that is removed, we won't get the magenta box when entering an
// inset for the first time
bv->updateInset(this);
bv->updateInset();
return DISPATCHED;
case LFUN_MOUSE_PRESS:
@ -723,7 +723,7 @@ dispatch_result InsetFormulaBase::localDispatch(FuncRequest const & cmd)
}
if (result == DISPATCHED)
bv->updateInset(this);
bv->updateInset();
mathcursor->normalize();
mathcursor->touch();
@ -853,7 +853,7 @@ bool InsetFormulaBase::searchForward(BufferView * bv, string const & str,
mathcursor->setSelection(it, ar.size());
current = it;
it.jump(ar.size());
bv->updateInset(this);
bv->updateInset();
return true;
}
}

9
src/text2.C
View File

@ -320,13 +320,12 @@ void LyXText::toggleInset()
if (!isHighlyEditableInset(inset))
recordUndo(bv(), Undo::ATOMIC);
if (inset->isOpen()) {
if (inset->isOpen())
inset->close(bv());
} else {
else
inset->open(bv());
}
bv()->updateInset(inset);
bv()->updateInset();
}
@ -959,7 +958,7 @@ void LyXText::setParagraph(bool line_top, bool line_bottom,
setSelection();
setCursor(tmpcursor.par(), tmpcursor.pos());
if (inset_owner)
bv()->updateInset(inset_owner);
bv()->updateInset();
}

12
src/text3.C
View File

@ -70,7 +70,7 @@ namespace {
if (selecting || lt->selection.mark()) {
lt->setSelection();
if (lt->isInInset())
bv->updateInset(lt->inset_owner);
bv->updateInset();
}
bv->update();
@ -363,7 +363,7 @@ void specialChar(LyXText * lt, BufferView * bv, InsetSpecialChar::Kind kind)
if (!bv->insertInset(new_inset))
delete new_inset;
else
bv->updateInset(new_inset);
bv->updateInset();
}
@ -975,7 +975,7 @@ InsetOld::RESULT LyXText::dispatch(FuncRequest const & cmd)
update();
changeCase(LyXText::text_uppercase);
if (inset_owner)
bv->updateInset(inset_owner);
bv->updateInset();
update();
break;
@ -983,7 +983,7 @@ InsetOld::RESULT LyXText::dispatch(FuncRequest const & cmd)
update();
changeCase(LyXText::text_lowercase);
if (inset_owner)
bv->updateInset(inset_owner);
bv->updateInset();
update();
break;
@ -991,7 +991,7 @@ InsetOld::RESULT LyXText::dispatch(FuncRequest const & cmd)
update();
changeCase(LyXText::text_capitalization);
if (inset_owner)
bv->updateInset(inset_owner);
bv->updateInset();
update();
break;
@ -1001,7 +1001,7 @@ InsetOld::RESULT LyXText::dispatch(FuncRequest const & cmd)
if (transposeChars(cursor))
checkParagraph(cursor.par(), cursor.pos());
if (inset_owner)
bv->updateInset(inset_owner);
bv->updateInset();
update();
break;