1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-11-21 08:27:13 +01:00

Most functions defining menus compute once and cache the result...

... Except a few where project or plugin manager state or preferences are
needed to compute the items, so evaluation is delayed, often inside lambdas

Comment "Delayed evaluation" wherever there are exceptions
This commit is contained in:
Paul Licameli
2019-01-09 11:27:32 -05:00
parent 33b4b409e8
commit f6e5696146
18 changed files with 354 additions and 261 deletions

View File

@@ -432,16 +432,17 @@ static CommandHandlerObject &findCommandHandler(AudacityProject &project) {
#define FN(X) (& ViewActions::Handler :: X)
MenuTable::BaseItemPtr ToolbarsMenu( AudacityProject& );
MenuTable::BaseItemSharedPtr ToolbarsMenu();
MenuTable::BaseItemPtr ViewMenu( AudacityProject& )
MenuTable::BaseItemSharedPtr ViewMenu()
{
using namespace MenuTable;
using Options = CommandManager::Options;
static const auto checkOff = Options{}.CheckState( false );
return FinderScope( findCommandHandler ).Eval(
static BaseItemSharedPtr menu{
FinderScope( findCommandHandler ).Eval(
Menu( XO("&View"),
Menu( XO("&Zoom"),
Command( wxT("ZoomIn"), XXO("Zoom &In"), FN(OnZoomIn),
@@ -532,7 +533,7 @@ MenuTable::BaseItemPtr ViewMenu( AudacityProject& )
//////////////////////////////////////////////////////////////////////////
ToolbarsMenu,
ToolbarsMenu(),
Separator(),
@@ -547,7 +548,9 @@ MenuTable::BaseItemPtr ViewMenu( AudacityProject& )
Command( wxT("ShowEffectsRack"), XXO("Show Effects Rack"),
FN(OnShowEffectsRack), AlwaysEnabledFlag, checkOff )
#endif
) );
) ) };
return menu;
}
#undef FN