@@ -732,12 +732,12 @@ class AlignNodesMenuCommand : public SingleMenuCommand
732
732
VCenter
733
733
};
734
734
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),
737
738
uiManager (uiManager),
738
739
uiEnvironment (uiEnvironment),
739
- relevantNodes (relevantNodes),
740
- mode (mode)
740
+ relevantNodes (relevantNodes)
741
741
{
742
742
743
743
}
@@ -824,31 +824,11 @@ class AlignNodesMenuCommand : public SingleMenuCommand
824
824
uiManager.ExecuteCommand (command);
825
825
}
826
826
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
-
847
827
private:
828
+ Mode mode;
848
829
NodeUIManager& uiManager;
849
830
NodeUIEnvironment& uiEnvironment;
850
831
NE::NodeCollection relevantNodes;
851
- Mode mode;
852
832
};
853
833
854
834
NE::NodeCollection GetNodesForCommand (const NodeUIManager& uiManager, const UINodePtr& uiNode)
@@ -893,13 +873,13 @@ MenuCommandStructure CreateNodeCommandStructure (NodeUIManager& uiManager, NodeU
893
873
commandStructureBuilder.RegisterCommand (groupingCommandGroup);
894
874
895
875
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 )));
903
883
commandStructureBuilder.RegisterCommand (alignCommandGroup);
904
884
}
905
885
0 commit comments