anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-31 15:46:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug #6888.

Browse Source 
This is why it was worth doing the updateBuffer() rewrite.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35975 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2010-11-01 20:57:10 +00:00
parent 03adcca071
commit 64e77d6c14
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/frontends/qt4/GuiView.cpp
View File

@ -1216,17 +1216,23 @@ void GuiView::setCurrentWorkArea(GuiWorkArea * wa)
theGuiApp()->setCurrentView(this);
d.current_work_area_ = wa;
// We need to reset this now, because it will need to be
// right if the tabWorkArea gets reset in the for loop. We
// will change it back if we aren't in that case.
GuiWorkArea * const old_cmwa = d.current_main_work_area_;
d.current_main_work_area_ = wa;
for (int i = 0; i != d.splitter_->count(); ++i) {
if (d.tabWorkArea(i)->setCurrentWorkArea(wa)) {
//if (d.current_main_work_area_)
// d.current_main_work_area_->setFrameStyle(QFrame::NoFrame);
d.current_main_work_area_ = wa;
//d.current_main_work_area_->setFrameStyle(QFrame::Box | QFrame::Plain);
//d.current_main_work_area_->setLineWidth(2);
LYXERR(Debug::DEBUG, "Current wa: " << currentWorkArea() << ", Current main wa: " << currentMainWorkArea());
LYXERR(Debug::DEBUG, "Current wa: " << currentWorkArea()
<< ", Current main wa: " << currentMainWorkArea());
return;
}
}
d.current_main_work_area_ = old_cmwa;
LYXERR(Debug::DEBUG, "This is not a tabbed wa");
on_currentWorkAreaChanged(wa);
BufferView & bv = wa->bufferView();
@ -1394,6 +1400,7 @@ void GuiView::updateTocItem(string const & type, DocIterator const & dit)
void GuiView::structureChanged()
{
d.toc_models_.reset(documentBufferView());
LYXERR0(documentBufferView());
// Navigator needs more than a simple update in this case. It needs to be
// rebuilt.
updateDialog("toc", "");

1
src/insets/InsetCommand.cpp
View File

@ -147,6 +147,7 @@ void InsetCommand::doDispatch(Cursor & cur, FuncRequest & cmd)
case LFUN_INSET_MODIFY: {
if (cmd.getArg(0) == "changetype") {
p_.setCmdName(cmd.getArg(1));
cur.forceBufferUpdate();
initView();
break;
}