anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-19 14:30:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove handling of dispatched() property in BufferView::dispatch

Browse Source 
As indicated in DispatchResult.h, this is only needed in insets'
doDispatch() methods, where lfuns can be delegated to a higher lever.
This commit is contained in:
Jean-Marc Lasgouttes 2024-09-06 16:21:47 +02:00
parent 6c20e5db7d
commit e5c31699b4
1 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/BufferView.cpp
View File

@ -1450,8 +1450,6 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
&& lyxaction.funcHasFlag(cmd.action(), LyXAction::NoInternal)) && lyxaction.funcHasFlag(cmd.action(), LyXAction::NoInternal))
return; return;
// We'll set this back to false if need be.
bool dispatched = true;
buffer_.undo().beginUndoGroup(); buffer_.undo().beginUndoGroup();
FuncCode const act = cmd.action(); FuncCode const act = cmd.action();
@ -1638,8 +1636,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
InsetMathRef * minset = InsetMathRef * minset =
getInsetByCode<InsetMathRef>(cur, MATH_REF_CODE); getInsetByCode<InsetMathRef>(cur, MATH_REF_CODE);
if (minset) if (minset)
lyx::dispatch(FuncRequest(LFUN_LABEL_GOTO, lyx::dispatch(FuncRequest(LFUN_LABEL_GOTO, minset->getTarget()));
minset->getTarget()));
} }
break; break;
} }
@ -1898,14 +1895,8 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
FindAndReplaceOptions opt; FindAndReplaceOptions opt;
istringstream iss(to_utf8(cmd.argument())); istringstream iss(to_utf8(cmd.argument()));
iss >> opt; iss >> opt;
if (findAdv(this, opt)) { if (findAdv(this, opt))
dr.screenUpdate(Update::Force | Update::FitCursor); dr.screenUpdate(Update::Force | Update::FitCursor);
cur.dispatched();
dispatched = true;
} else {
cur.undispatched();
dispatched = false;
}
break; break;
} }
@ -2199,10 +2190,8 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
how = SCROLL_TOGGLE; how = SCROLL_TOGGLE;
else if (where == "visible") else if (where == "visible")
how = SCROLL_VISIBLE; how = SCROLL_VISIBLE;
else { else
dispatched = false;
break; break;
}
showCursor(how); showCursor(how);
break; break;
} }
@ -2212,10 +2201,8 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
scroll_step = d->scrollbarParameters_.single_step; scroll_step = d->scrollbarParameters_.single_step;
else if (scroll_type == "page") else if (scroll_type == "page")
scroll_step = d->scrollbarParameters_.page_step; scroll_step = d->scrollbarParameters_.page_step;
else { else
dispatched = false;
break; break;
}
string const scroll_quantity = cmd.getArg(1); string const scroll_quantity = cmd.getArg(1);
@ -2225,10 +2212,8 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
scroll(scroll_step); scroll(scroll_step);
else if (isStrInt(scroll_quantity)) else if (isStrInt(scroll_quantity))
scroll(scroll_step * convert<int>(scroll_quantity)); scroll(scroll_step * convert<int>(scroll_quantity));
else { else
dispatched = false;
break; break;
}
dr.screenUpdate(Update::ForceDraw); dr.screenUpdate(Update::ForceDraw);
dr.forceBufferUpdate(); dr.forceBufferUpdate();
@ -2478,14 +2463,13 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
if (!opt1.empty()) if (!opt1.empty())
LYXERR0("Discarding optional argument to citation-insert."); LYXERR0("Discarding optional argument to citation-insert.");
} }
dispatched = true;
break; break;
} }
InsetCommandParams icp(CITE_CODE); InsetCommandParams icp(CITE_CODE);
icp["key"] = from_utf8(arg); icp["key"] = from_utf8(arg);
if (!opt1.empty()) if (!opt1.empty())
icp["before"] = from_utf8(opt1); icp["before"] = from_utf8(opt1);
icp["literal"] = icp["literal"] =
from_ascii(InsetCitation::last_literal ? "true" : "false"); from_ascii(InsetCitation::last_literal ? "true" : "false");
string icstr = InsetCommand::params2string(icp); string icstr = InsetCommand::params2string(icp);
FuncRequest fr(LFUN_INSET_INSERT, icstr); FuncRequest fr(LFUN_INSET_INSERT, icstr);
@ -2571,7 +2555,6 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
if (cur.inTexted() && cur.selection() if (cur.inTexted() && cur.selection()
&& cur.selectionBegin().idx() != cur.selectionEnd().idx()) { && cur.selectionBegin().idx() != cur.selectionEnd().idx()) {
buffer_.dispatch(cmd, dr); buffer_.dispatch(cmd, dr);
dispatched = dr.dispatched();
break; break;
} }
cap::copySelection(cur); cap::copySelection(cur);
@ -2581,12 +2564,10 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
default: default:
// OK, so try the Buffer itself... // OK, so try the Buffer itself...
buffer_.dispatch(cmd, dr); buffer_.dispatch(cmd, dr);
dispatched = dr.dispatched();
break; break;
} }
buffer_.undo().endUndoGroup(); buffer_.undo().endUndoGroup();
dr.dispatched(dispatched);
// NOTE: The code below is copied from Cursor::dispatch. If you // NOTE: The code below is copied from Cursor::dispatch. If you
// need to modify this, please update the other one too. // need to modify this, please update the other one too.