mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-05 13:26:21 +00:00
rename fullRebreak() to partialRebreak() and implement
a fullRebreak() that really breaks fully git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7215 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
5795dddd40
commit
fb27166b77
@ -636,7 +636,7 @@ bool BufferView::ChangeInsets(Inset::Code code,
|
||||
text->setCursorIntern(it.pit(), 0);
|
||||
text->redoParagraphs(text->cursor,
|
||||
boost::next(text->cursor.par()));
|
||||
text->fullRebreak();
|
||||
text->partialRebreak();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -617,7 +617,7 @@ void BufferView::Pimpl::update(LyXText * text, BufferView::UpdateCodes f)
|
||||
text->selection.cursor = text->cursor;
|
||||
}
|
||||
|
||||
text->fullRebreak();
|
||||
text->partialRebreak();
|
||||
|
||||
if (text->inset_owner) {
|
||||
text->inset_owner->setUpdateStatus(bv_, InsetText::NONE);
|
||||
@ -636,7 +636,7 @@ void BufferView::Pimpl::update(BufferView::UpdateCodes f)
|
||||
text->selection.cursor = text->cursor;
|
||||
}
|
||||
|
||||
text->fullRebreak();
|
||||
text->partialRebreak();
|
||||
|
||||
if (text->inset_owner) {
|
||||
text->inset_owner->setUpdateStatus(bv_, InsetText::NONE);
|
||||
|
@ -12,6 +12,10 @@
|
||||
* text2.C:
|
||||
* text3.C: remove LyXCursor::row_ member
|
||||
|
||||
* lyxtext.h:
|
||||
* text.C: rename fullRebreak() to partialRebreak() and implement
|
||||
a fullRebreak() that really bereks fully
|
||||
|
||||
2003-06-26 Alfredo Brauntein <abraunst@lyx.org>
|
||||
|
||||
* lyx_main.C (LyX): get full path of document loaded on the
|
||||
|
@ -452,10 +452,7 @@ Inset::RESULT InsetERT::localDispatch(FuncRequest const & cmd)
|
||||
* Open (needfullrow) to Inlined (only the space
|
||||
* taken by the text).
|
||||
*/
|
||||
LyXText * t = inset.getLyXText(cmd.view());
|
||||
t->need_break_row = t->rows().begin();
|
||||
t->fullRebreak();
|
||||
t->setCursorIntern(t->cursor.par(), t->cursor.pos());
|
||||
inset.getLyXText(cmd.view())->fullRebreak();
|
||||
inset.update(cmd.view(), true);
|
||||
bv->updateInset(this);
|
||||
result = DISPATCHED;
|
||||
|
@ -118,11 +118,8 @@ dispatch_result InsetMinipage::localDispatch(FuncRequest const & cmd)
|
||||
|
||||
/* FIXME: I refuse to believe we have to live
|
||||
* with ugliness like this ... */
|
||||
LyXText * t = inset.getLyXText(cmd.view());
|
||||
t->need_break_row = t->rows().begin();
|
||||
t->fullRebreak();
|
||||
inset.getLyXText(cmd.view())->fullRebreak();
|
||||
inset.update(cmd.view(), true);
|
||||
t->setCursorIntern(t->cursor.par(), t->cursor.pos());
|
||||
cmd.view()->updateInset(this);
|
||||
return DISPATCHED;
|
||||
}
|
||||
|
@ -524,7 +524,7 @@ void InsetText::updateLocal(BufferView * bv, int what, bool mark_dirty)
|
||||
lt = getLyXText(bv);
|
||||
clear = true;
|
||||
}
|
||||
lt->fullRebreak();
|
||||
lt->partialRebreak();
|
||||
setUpdateStatus(bv, what);
|
||||
bool flag = mark_dirty ||
|
||||
(((need_update != CURSOR) && (need_update != NONE)) ||
|
||||
|
@ -180,7 +180,9 @@ public:
|
||||
///
|
||||
void insertInset(Inset * inset);
|
||||
|
||||
/// Completes the insertion with a full rebreak
|
||||
/// Completes the insertion with a rebreak from 'need_break_row' on
|
||||
void partialRebreak();
|
||||
/// a full rebreak of the whole text
|
||||
void fullRebreak();
|
||||
|
||||
///
|
||||
|
@ -723,6 +723,14 @@ void LyXText::redoParagraphs(LyXCursor const & cur,
|
||||
|
||||
|
||||
void LyXText::fullRebreak()
|
||||
{
|
||||
need_break_row = rows().begin();
|
||||
partialRebreak();
|
||||
setCursorIntern(cursor.par(), cursor.pos());
|
||||
}
|
||||
|
||||
|
||||
void LyXText::partialRebreak()
|
||||
{
|
||||
if (rows().empty()) {
|
||||
init(bv());
|
||||
|
@ -1393,7 +1393,7 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
|
||||
// Clear the selection
|
||||
bv->screen().toggleSelection(bv->text, bv);
|
||||
bv->text->clearSelection();
|
||||
bv->text->fullRebreak();
|
||||
bv->text->partialRebreak();
|
||||
bv->update();
|
||||
bv->updateScrollbar();
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user