diff options
| author | markt <markt> | 2007-12-11 19:29:00 (GMT) |
|---|---|---|
| committer | markt <markt> | 2007-12-11 19:29:00 (GMT) |
| commit | 474e2017454d3c6492eb9f428aee039d36d76e05 (patch) | |
| tree | cae44371e3dc31d1cb3aafdd2fbf83a26527e540 /src/MenuCreator.cc | |
| parent | 38877987c43857f79481bedeb036380b32019a0f (diff) | |
| download | fluxbox-474e2017454d3c6492eb9f428aee039d36d76e05.zip fluxbox-474e2017454d3c6492eb9f428aee039d36d76e05.tar.bz2 | |
only allow one open menu at a time
Diffstat (limited to 'src/MenuCreator.cc')
| -rw-r--r-- | src/MenuCreator.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/MenuCreator.cc b/src/MenuCreator.cc index a99d785..8cc483a 100644 --- a/src/MenuCreator.cc +++ b/src/MenuCreator.cc | |||
| @@ -256,8 +256,7 @@ static void translateMenuItem(Parser &parse, ParseItem &pitem, FbTk::StringConve | |||
| 256 | // execute and hide menu | 256 | // execute and hide menu |
| 257 | using namespace FbTk; | 257 | using namespace FbTk; |
| 258 | RefCount<Command> exec_cmd(CommandParser::instance().parseLine("exec " + str_cmd)); | 258 | RefCount<Command> exec_cmd(CommandParser::instance().parseLine("exec " + str_cmd)); |
| 259 | RefCount<Command> hide_menu(new SimpleCommand<FbTk::Menu>(menu, | 259 | RefCount<Command> hide_menu(CommandParser::instance().parseLine("hidemenus")); |
| 260 | &Menu::hide)); | ||
| 261 | MacroCommand *exec_and_hide = new FbTk::MacroCommand(); | 260 | MacroCommand *exec_and_hide = new FbTk::MacroCommand(); |
| 262 | exec_and_hide->add(hide_menu); | 261 | exec_and_hide->add(hide_menu); |
| 263 | exec_and_hide->add(exec_cmd); | 262 | exec_and_hide->add(exec_cmd); |
| @@ -266,8 +265,7 @@ static void translateMenuItem(Parser &parse, ParseItem &pitem, FbTk::StringConve | |||
| 266 | } else if (str_key == "macrocmd") { | 265 | } else if (str_key == "macrocmd") { |
| 267 | using namespace FbTk; | 266 | using namespace FbTk; |
| 268 | RefCount<Command> macro_cmd(CommandParser::instance().parseLine("macrocmd " + str_cmd)); | 267 | RefCount<Command> macro_cmd(CommandParser::instance().parseLine("macrocmd " + str_cmd)); |
| 269 | RefCount<Command> hide_menu(new SimpleCommand<FbTk::Menu>(menu, | 268 | RefCount<Command> hide_menu(CommandParser::instance().parseLine("hidemenus")); |
| 270 | &Menu::hide)); | ||
| 271 | MacroCommand *exec_and_hide = new FbTk::MacroCommand(); | 269 | MacroCommand *exec_and_hide = new FbTk::MacroCommand(); |
| 272 | exec_and_hide->add(hide_menu); | 270 | exec_and_hide->add(hide_menu); |
| 273 | exec_and_hide->add(macro_cmd); | 271 | exec_and_hide->add(macro_cmd); |