@@ -732,12 +732,12 @@ class AlignNodesMenuCommand : public SingleMenuCommand
732732 VCenter
733733 };
734734
735- AlignNodesMenuCommand (NodeUIManager& uiManager, NodeUIEnvironment& uiEnvironment, const NE ::NodeCollection& relevantNodes, Mode mode) :
736- SingleMenuCommand (GetCommandName (mode), false ),
735+ AlignNodesMenuCommand (const std::wstring& name, Mode mode, NodeUIManager& uiManager, NodeUIEnvironment& uiEnvironment, const NE ::NodeCollection& relevantNodes) :
736+ SingleMenuCommand (name, false ),
737+ mode (mode),
737738 uiManager (uiManager),
738739 uiEnvironment (uiEnvironment),
739- relevantNodes (relevantNodes),
740- mode (mode)
740+ relevantNodes (relevantNodes)
741741 {
742742
743743 }
@@ -824,31 +824,11 @@ class AlignNodesMenuCommand : public SingleMenuCommand
824824 uiManager.ExecuteCommand (command);
825825 }
826826
827- static std::wstring GetCommandName (Mode mode)
828- {
829- switch (mode) {
830- case Mode::Left:
831- return L" Left" ;
832- case Mode::Right:
833- return L" Right" ;
834- case Mode::Top:
835- return L" Top" ;
836- case Mode::Bottom:
837- return L" Bottom" ;
838- case Mode::HCenter:
839- return L" Center Horizontally" ;
840- case Mode::VCenter:
841- return L" Center Vertically" ;
842- }
843- DBGBREAK ();
844- return L" " ;
845- }
846-
847827private:
828+ Mode mode;
848829 NodeUIManager& uiManager;
849830 NodeUIEnvironment& uiEnvironment;
850831 NE ::NodeCollection relevantNodes;
851- Mode mode;
852832};
853833
854834NE ::NodeCollection GetNodesForCommand (const NodeUIManager& uiManager, const UINodePtr& uiNode)
@@ -893,13 +873,13 @@ MenuCommandStructure CreateNodeCommandStructure (NodeUIManager& uiManager, NodeU
893873 commandStructureBuilder.RegisterCommand (groupingCommandGroup);
894874
895875 if (relevantNodes.Count () > 1 ) {
896- GroupMenuCommandPtr alignCommandGroup (new GroupMenuCommand (L" Align " ));
897- alignCommandGroup->AddChildCommand (MenuCommandPtr (new AlignNodesMenuCommand (uiManager, uiEnvironment, relevantNodes, AlignNodesMenuCommand::Mode::Left)));
898- alignCommandGroup->AddChildCommand (MenuCommandPtr (new AlignNodesMenuCommand (uiManager, uiEnvironment, relevantNodes, AlignNodesMenuCommand::Mode::Right)));
899- alignCommandGroup->AddChildCommand (MenuCommandPtr (new AlignNodesMenuCommand (uiManager, uiEnvironment, relevantNodes, AlignNodesMenuCommand::Mode::Top)));
900- alignCommandGroup->AddChildCommand (MenuCommandPtr (new AlignNodesMenuCommand (uiManager, uiEnvironment, relevantNodes, AlignNodesMenuCommand::Mode::Bottom)));
901- alignCommandGroup->AddChildCommand (MenuCommandPtr (new AlignNodesMenuCommand (uiManager, uiEnvironment, relevantNodes, AlignNodesMenuCommand::Mode::HCenter)));
902- alignCommandGroup->AddChildCommand (MenuCommandPtr (new AlignNodesMenuCommand (uiManager, uiEnvironment, relevantNodes, AlignNodesMenuCommand::Mode::VCenter)));
876+ GroupMenuCommandPtr alignCommandGroup (new GroupMenuCommand (L" Aligning " ));
877+ alignCommandGroup->AddChildCommand (MenuCommandPtr (new AlignNodesMenuCommand (L" Align Left " , AlignNodesMenuCommand::Mode::Left, uiManager, uiEnvironment, relevantNodes )));
878+ alignCommandGroup->AddChildCommand (MenuCommandPtr (new AlignNodesMenuCommand (L" Align Right " , AlignNodesMenuCommand::Mode::Right, uiManager, uiEnvironment, relevantNodes )));
879+ alignCommandGroup->AddChildCommand (MenuCommandPtr (new AlignNodesMenuCommand (L" Align Top " , AlignNodesMenuCommand::Mode::Top, uiManager, uiEnvironment, relevantNodes )));
880+ alignCommandGroup->AddChildCommand (MenuCommandPtr (new AlignNodesMenuCommand (L" Align Bottom " , AlignNodesMenuCommand::Mode::Bottom, uiManager, uiEnvironment, relevantNodes )));
881+ alignCommandGroup->AddChildCommand (MenuCommandPtr (new AlignNodesMenuCommand (L" Center Horizontically " , AlignNodesMenuCommand::Mode::HCenter, uiManager, uiEnvironment, relevantNodes )));
882+ alignCommandGroup->AddChildCommand (MenuCommandPtr (new AlignNodesMenuCommand (L" Center Vertically " , AlignNodesMenuCommand::Mode::VCenter, uiManager, uiEnvironment, relevantNodes )));
903883 commandStructureBuilder.RegisterCommand (alignCommandGroup);
904884 }
905885
0 commit comments