Add align to window functionality.

Author: kovacsv

Sources/NodeEngineTest/NodeEditorVisualTest.cpp

@@ -436,4 +436,12 @@ TEST (FitToWindowTest)
 	ASSERT (env.CheckReference ("10_FitToWindow_Fit.svg"));
 }
 
+TEST (AlignToWindowTest)
+{
+	SimpleNodeEditorTestEnvWithConnections env;
+	ASSERT (env.CheckReference ("11_AlignToWindow_Basic.svg"));
+	env.nodeEditor.AlignToWindow ();
+	ASSERT (env.CheckReference ("11_AlignToWindow_Align.svg"));
+}
+
 }

Sources/NodeEngineTest/VisualTestFiles/11_AlignToWindow_Align.svg

@@ -185,15 +185,29 @@ Point NodeEditor::ViewToModel (const Point& viewPoint) const
 	return viewBox.ViewToModel (viewPoint);
 }
 
-void NodeEditor::FitToWindow ()
+void NodeEditor::AlignToWindow ()
 {
 	Rect boundingRect;
 	if (!GetBoundingRect (uiManager, uiEnvironment, boundingRect)) {
 		return;
 	}
 
 	double viewPadding = uiEnvironment.GetSkinParams ().GetNodePadding ();
+	const DrawingContext& drawingContext = uiEnvironment.GetDrawingContext ();
+	Size contextSize (drawingContext.GetWidth (), drawingContext.GetHeight ());
+	ViewBox newViewBox (-boundingRect.GetTopLeft () + Point (viewPadding, viewPadding), 1.0);
+	uiManager.SetViewBox (newViewBox);
+	Update ();
+}
+
+void NodeEditor::FitToWindow ()
+{
+	Rect boundingRect;
+	if (!GetBoundingRect (uiManager, uiEnvironment, boundingRect)) {
+		return;
+	}
 
+	double viewPadding = uiEnvironment.GetSkinParams ().GetNodePadding ();
 	const DrawingContext& drawingContext = uiEnvironment.GetDrawingContext ();
 	Size contextSize (drawingContext.GetWidth (), drawingContext.GetHeight ());
 	ViewBox newViewBox = FitRectToSize (contextSize, viewPadding, boundingRect);

Sources/NodeEngineTest/VisualTestFiles/11_AlignToWindow_Basic.svg

@@ -60,6 +60,7 @@ class NodeEditor
 	void						ConnectOutputSlotToInputSlot (const UIOutputSlotConstPtr& outputSlot, const UIInputSlotConstPtr& inputSlot);
 
 	Point						ViewToModel (const Point& viewPoint) const;
+	void						AlignToWindow ();
 	void						FitToWindow ();
 
 	void						New ();

Sources/NodeUIEngine/NUIE_NodeEditor.cpp

@@ -284,6 +284,11 @@ NUIE::Point NodeEditorControl::ViewToModel (const NUIE::Point& viewPoint) const
 	return nodeEditor->ViewToModel (viewPoint);
 }
 
+void NodeEditorControl::AlignToWindow ()
+{
+	nodeEditor->AlignToWindow ();
+}
+
 void NodeEditorControl::FitToWindow ()
 {
 	nodeEditor->FitToWindow ();

Sources/NodeUIEngine/NUIE_NodeEditor.hpp

@@ -106,6 +106,7 @@ class NodeEditorControl : public wxPanel
 
 	void			AddNode (const NUIE::UINodePtr& uiNode);
 	NUIE::Point		ViewToModel (const NUIE::Point& viewPoint) const;
+	void			AlignToWindow ();
 	void			FitToWindow ();
 
 	void			New ();

Sources/wxWidgetsAppSupport/WXAS_NodeEditorControl.cpp

@@ -281,7 +281,8 @@ class MenuBar : public wxMenuBar
 		Mode_Automatic		= 8,
 		Mode_Manual			= 9,
 		Mode_Update			= 10,
-		View_FitToWindow	= 11
+		View_AlignToWindow	= 11,
+		View_FitToWindow	= 12
 	};
 
 	MenuBar () :
@@ -309,6 +310,7 @@ class MenuBar : public wxMenuBar
 		Append (modeMenu, L"&Mode");
 
 		wxMenu* viewMenu = new wxMenu ();
+		viewMenu->Append (CommandId::View_AlignToWindow, "Align To Window");
 		viewMenu->Append (CommandId::View_FitToWindow, "Fit To Window");
 		Append (viewMenu, L"&View");
 	}
@@ -447,6 +449,11 @@ class MainFrame : public wxFrame
 					nodeEditorControl->ManualUpdate ();
 				}
 				break;
+			case MenuBar::CommandId::View_AlignToWindow:
+				{
+					nodeEditorControl->AlignToWindow ();
+				}
+				break;
 			case MenuBar::CommandId::View_FitToWindow:
 				{
 					nodeEditorControl->FitToWindow ();