anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-27 06:19:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

updateLayoutChoice move

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6530 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
John Levon 2003-03-18 20:54:01 +00:00
parent 769452eb15
commit b596bc71f2
4 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/BufferView_pimpl.C
View File

@ -379,6 +379,8 @@ void BufferView::Pimpl::scrollDocView(int value)
vbt->setCursorFromCoordinates(0, first); vbt->setCursorFromCoordinates(0, first);
else if (vbt->cursor.y() > last) else if (vbt->cursor.y() > last)
vbt->setCursorFromCoordinates(0, last); vbt->setCursorFromCoordinates(0, last);
owner_->updateLayoutChoice();
} }
@ -568,8 +570,6 @@ void BufferView::Pimpl::update()
void BufferView::Pimpl::update(LyXText * text, BufferView::UpdateCodes f) void BufferView::Pimpl::update(LyXText * text, BufferView::UpdateCodes f)
{ {
owner_->updateLayoutChoice();
if (!text->selection.set() && (f & SELECT)) { if (!text->selection.set() && (f & SELECT)) {
text->selection.cursor = text->cursor; text->selection.cursor = text->cursor;
} }

9
src/ChangeLog
View File

@ -1,3 +1,12 @@
2003-03-18 John Levon <levon@movementarian.org>
* BufferView_pimpl.C (scrollDocView): add updateLayoutChoice(),
remove it from update()
* lyxfunc.C: update layout choice after an lfun
* text3.C: remove extra updateLayoutChoice()s
2003-03-18 John Levon <levon@movementarian.org> 2003-03-18 John Levon <levon@movementarian.org>
* text.C: top_y change means full repaint, fix * text.C: top_y change means full repaint, fix

2
src/lyxfunc.C
View File

@ -1579,6 +1579,8 @@ void LyXFunc::dispatch(FuncRequest const & ev, bool verbose)
break; break;
} // end of switch } // end of switch
view()->owner()->updateLayoutChoice();
exit_with_message: exit_with_message:
sendDispatchMessage(getMessage(), ev, verbose); sendDispatchMessage(getMessage(), ev, verbose);
} }

2
src/text3.C
View File

@ -1408,7 +1408,6 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
// Highly editable inset, like math // Highly editable inset, like math
UpdatableInset * inset = static_cast<UpdatableInset *>(inset_hit); UpdatableInset * inset = static_cast<UpdatableInset *>(inset_hit);
selection_possible = false; selection_possible = false;
bv->owner()->updateLayoutChoice();
bv->owner()->message(inset->editMessage()); bv->owner()->message(inset->editMessage());
//inset->edit(bv, x, y, cmd.button()); //inset->edit(bv, x, y, cmd.button());
// We just have to lock the inset before calling a PressEvent on it! // We just have to lock the inset before calling a PressEvent on it!
@ -1433,7 +1432,6 @@ Inset::RESULT LyXText::dispatch(FuncRequest const & cmd)
bv->text->selection.cursor = bv->text->cursor; bv->text->selection.cursor = bv->text->cursor;
bv->text->cursor.x_fix(bv->text->cursor.x()); bv->text->cursor.x_fix(bv->text->cursor.x());
bv->owner()->updateLayoutChoice();
if (bv->fitCursor()) if (bv->fitCursor())
selection_possible = false; selection_possible = false;