* GuiDocument.cpp:

- update colors before changing branches.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30471 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2009-07-11 10:53:29 +00:00
parent 201a22b96f
commit cbce556e0b

View File

@ -2036,6 +2036,7 @@ void GuiDocument::applyView()
bp_.footskip = widgetsToLength(m->footskipLE, m->footskipUnit); bp_.footskip = widgetsToLength(m->footskipLE, m->footskipUnit);
bp_.columnsep = widgetsToLength(m->columnsepLE, m->columnsepUnit); bp_.columnsep = widgetsToLength(m->columnsepLE, m->columnsepUnit);
// branches
branchesModule->apply(bp_); branchesModule->apply(bp_);
// PDF support // PDF support
@ -2642,11 +2643,6 @@ void GuiDocument::dispatchParams()
// This must come first so that a language change is correctly noticed // This must come first so that a language change is correctly noticed
setLanguage(); setLanguage();
// rename branches in the document
executeBranchRenaming();
// and clear changed branches cache
changedBranches_.clear();
// Apply the BufferParams. Note that this will set the base class // Apply the BufferParams. Note that this will set the base class
// and then update the buffer's layout. // and then update the buffer's layout.
dispatch_bufferparams(*this, params(), LFUN_BUFFER_PARAMS_APPLY); dispatch_bufferparams(*this, params(), LFUN_BUFFER_PARAMS_APPLY);
@ -2690,6 +2686,11 @@ void GuiDocument::dispatchParams()
dispatch(FuncRequest(LFUN_ALL_INSETS_TOGGLE, dispatch(FuncRequest(LFUN_ALL_INSETS_TOGGLE,
"assign branch")); "assign branch"));
} }
// rename branches in the document
executeBranchRenaming();
// and clear changed branches cache
changedBranches_.clear();
// Generate the colours requested by indices. // Generate the colours requested by indices.
IndicesList & indiceslist = params().indiceslist(); IndicesList & indiceslist = params().indiceslist();
if (!indiceslist.empty()) { if (!indiceslist.empty()) {