Display minibuffer with command-execute (M-x)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15970 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Bo Peng 2006-11-18 20:38:41 +00:00
parent 8346fb6a47
commit 65e5f1e6dc
2 changed files with 16 additions and 4 deletions

View File

@ -133,8 +133,6 @@ TOOLBARS & MINIBUFFER
* TODO toolbar popup menu, currently disabled (Peter 9/11/06) * TODO toolbar popup menu, currently disabled (Peter 9/11/06)
* M-x is broken (does not bring up the minibuffer).
* Command completion in the minibuffer shows a huge blank area below the proposed * Command completion in the minibuffer shows a huge blank area below the proposed
commands. Clicking in that empty area crashes LyX. commands. Clicking in that empty area crashes LyX.
@ -411,3 +409,7 @@ CREDITS:
* Items in the TOC cannot be moved using drag & drop (Joost 4/11/06). * Items in the TOC cannot be moved using drag & drop (Joost 4/11/06).
WONTFIX (Abdel 2006-11-17): at least not for 1.5.0, this is just candy anyway. WONTFIX (Abdel 2006-11-17): at least not for 1.5.0, this is just candy anyway.
* M-x is broken (does not bring up the minibuffer).
FIXED (Bo, 2006-11-18): set toolbar flag in display function.

View File

@ -118,11 +118,21 @@ void Toolbars::init()
void Toolbars::display(string const & name, bool show) void Toolbars::display(string const & name, bool show)
{ {
ToolbarBackend::Toolbars::const_iterator cit = toolbarbackend.begin(); ToolbarBackend::Toolbars::iterator cit = toolbarbackend.begin();
ToolbarBackend::Toolbars::const_iterator end = toolbarbackend.end(); ToolbarBackend::Toolbars::iterator end = toolbarbackend.end();
for (; cit != end; ++cit) { for (; cit != end; ++cit) {
if (cit->name == name) { if (cit->name == name) {
unsigned int flags = cit->flags;
TurnOffFlag(AUTO);
if(show) {
TurnOnFlag(ON);
TurnOnFlag(OFF);
} else {
TurnOnFlag(OFF);
TurnOnFlag(ON);
}
cit->flags = static_cast<lyx::ToolbarBackend::Flags>(flags);
displayToolbar(*cit, show); displayToolbar(*cit, show);
return; return;
} }