Separate selection handling from EditorApp and refactor

Author: MaximDude

Editor/EditorApp.cpp

@@ -292,74 +292,6 @@ namespace RTEGUI {
 		return (mousePosX >= xPos && mousePosX <= xPos + width && mousePosY >= yPos && mousePosY <= yPos + height) ? true : false;
 	}
 
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-	void EditorApp::CalculateHandleResize(int mousePosX, int mousePosY, int *xPos, int *yPos, int *width, int *height) {
-		int controlPosX;
-		int controlPosY;
-		int controlWidth;
-		int controlHeight;
-		m_SelectionInfo.Control->GetControlRect(&controlPosX, &controlPosY, &controlWidth, &controlHeight);
-		GUIControl *parent = m_SelectionInfo.Control->GetParent();
-
-		int minSize = 5;
-
-		int parentPosX;
-		int parentPosY;
-		int parentWidth;
-		int parentHeight;
-		parent->GetControlRect(&parentPosX, &parentPosY, &parentWidth, &parentHeight);
-
-		// Left Move/Resize
-		if (m_SelectionInfo.HandleIndex == 0 || m_SelectionInfo.HandleIndex == 3 || m_SelectionInfo.HandleIndex == 6) {
-			int diff = mousePosX - m_SelectionInfo.GrabX;
-			if (controlPosX + diff < parentPosX) { diff = parentPosX - controlPosX; }
-			if (controlWidth - diff < minSize) { diff = controlWidth - minSize; }
-
-			diff = ProcessSnapCoord(diff);
-
-			controlPosX += diff;
-			controlWidth -= diff;
-		}
-		// Top Move/Resize
-		if (m_SelectionInfo.HandleIndex == 0 || m_SelectionInfo.HandleIndex == 1 || m_SelectionInfo.HandleIndex == 2) {
-			int diff = mousePosY - m_SelectionInfo.GrabY;
-			if (controlPosY + diff < parentPosY) { diff = parentPosY - controlPosY; }
-			if (controlHeight - diff < minSize) { diff = controlHeight - minSize; }
-
-			diff = ProcessSnapCoord(diff);
-
-			controlPosY += diff;
-			controlHeight -= diff;
-		}
-		// Right Resize
-		if (m_SelectionInfo.HandleIndex == 2 || m_SelectionInfo.HandleIndex == 5 || m_SelectionInfo.HandleIndex == 8) {
-			int diff = mousePosX - m_SelectionInfo.GrabX;
-			if (controlPosX + controlWidth + diff > parentPosX + parentWidth) { diff = (parentPosX + parentWidth) - (controlPosX + controlWidth); }
-
-			diff = ProcessSnapCoord(diff);
-
-			controlWidth += diff;
-		}
-		// Bottom Resize
-		if (m_SelectionInfo.HandleIndex == 6 || m_SelectionInfo.HandleIndex == 7 || m_SelectionInfo.HandleIndex == 8) {
-			int diff = mousePosY - m_SelectionInfo.GrabY;
-			if (controlPosY + controlHeight + diff > parentPosY + parentHeight) { diff = (parentPosY + parentHeight) - (controlPosY + controlHeight); }
-
-			diff = ProcessSnapCoord(diff);
-
-			controlHeight += diff;
-		}
-
-		controlWidth = std::max(controlWidth, minSize);
-		controlHeight = std::max(controlHeight, minSize);
-
-		*xPos = controlPosX;
-		*yPos = controlPosY;
-		*width = controlWidth;
-		*height = controlHeight;
-	}
-
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	int EditorApp::ProcessSnapCoord(int position) const {
@@ -696,52 +628,9 @@ namespace RTEGUI {
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-	void EditorApp::DrawSelectionBox(GUIControl *control) {
-		assert(control);
-
-		int mousePosX;
-		int mousePosY;
-		m_Input->GetMousePosition(&mousePosX, &mousePosY);
-
-		int controlPosX;
-		int controlPosY;
-		int controlWidth;
-		int controlHeight;
-		control->GetControlRect(&controlPosX, &controlPosY, &controlWidth, &controlHeight);
-
-		// If we've grabbed the control, draw the selection lines where the mouse is
-		if (m_SelectionInfo.GrabbedControl && m_SelectionInfo.TriggerGrab) {
-			controlPosX = mousePosX + m_SelectionInfo.GrabX;
-			controlPosY = mousePosY + m_SelectionInfo.GrabY;
-
-			controlPosX = ProcessSnapCoord(controlPosX);
-			controlPosY = ProcessSnapCoord(controlPosY);
 		}
 
-		// Grabbed handles
-		if (m_SelectionInfo.GrabbedHandle && m_SelectionInfo.TriggerGrab) { CalculateHandleResize(mousePosX, mousePosY, &controlPosX, &controlPosY, &controlWidth, &controlHeight); }
-
-		GUIRect rect;
-		SetRect(&rect, controlPosX - 6, controlPosY - 6, controlPosX + controlWidth + 6, controlPosY + controlHeight + 6);
-		m_Screen->GetBitmap()->SetClipRect(&rect);
-
-		m_Screen->GetBitmap()->DrawRectangle(controlPosX, controlPosY, controlWidth, controlHeight, 0xFFCCCCCC, false);
-
-		// Draw the handles
-		for (int i = 0; i < 3; i++) {
-			DrawSelectionResizeBox(controlPosX, controlPosY + i * (controlHeight / 2));
-			if (i != 1) { DrawSelectionResizeBox(controlPosX + controlWidth / 2, controlPosY + i * (controlHeight / 2)); }
-			DrawSelectionResizeBox(controlPosX + controlWidth, controlPosY + i * (controlHeight / 2));
-		}
-		m_Screen->GetBitmap()->SetClipRect(nullptr);
-	}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-	void EditorApp::DrawSelectionResizeBox(int xPos, int yPos) const {
-		int boxSize = (m_Zoom) ? 5 : 7;
-		m_Screen->GetBitmap()->DrawRectangle(xPos - boxSize / 2, yPos - boxSize / 2, boxSize, boxSize, 0x000000, true);
-		m_Screen->GetBitmap()->DrawRectangle(xPos - boxSize / 2, yPos - boxSize / 2, boxSize, boxSize, 0xFFFFFF, false);
 	}
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

Editor/EditorApp.h

@@ -86,35 +86,6 @@ namespace RTEGUI {
 
 	private:
 
-		/// <summary>
-		/// GUI element selection structure.
-		/// </summary>
-		struct Selection {
-			bool GrabbedControl = false;
-			bool GrabbedHandle = false;
-			bool TriggerGrab = false;
-
-			GUIControl *Control = nullptr;
-			int HandleIndex = 0;
-
-			int GrabX = 0;
-			int GrabY = 0;
-			int	ClickX = 0;
-			int ClickY = 0;
-
-			/// <summary>
-			/// Clears selection info.
-			/// </summary>
-			void ClearSelection() {
-				GrabbedControl = false;
-				GrabbedHandle = false;
-				TriggerGrab = false;
-				Control = nullptr;
-				HandleIndex = 0;
-				GrabX = 0;
-				GrabY = 0;
-			}
-		};
 
 		bool m_Quit = false;
 		bool m_WindowResized = false;
@@ -143,9 +114,7 @@ namespace RTEGUI {
 
 		// Editor setup
 		bool m_UnsavedChanges = false;
-		bool m_SnapToGrid = true;
 		bool m_Zoom = false;
-		int	m_GridSize = 5;
 		int m_WorkspacePosX = 320;
 		int m_WorkspacePosY = 60;
 		int m_WorkspaceWidth = 640;
@@ -208,23 +177,6 @@ namespace RTEGUI {
 		/// <returns>True/False.</returns>
 		bool MouseInsideBox(int mousePosX, int mousePosY, int xPos, int yPos, int width, int height) const;
 
-		/// <summary>
-		/// Calculates new position/size of a control given a handle movement.
-		/// </summary>
-		/// <param name="MouseX">Mouse.</param>
-		/// <param name="MouseY"></param>
-		/// <param name="X">Position.</param>
-		/// <param name="Y"></param>
-		/// <param name="Width">Size.</param>
-		/// <param name="Height"></param>
-		void CalculateHandleResize(int mousePosX, int mousePosY, int *xPos, int *yPos, int *width, int *height);
-
-		/// <summary>
-		/// Calculates the nearest snap position (if snap is on).
-		/// </summary>
-		/// <param name="Position">Position.</param>
-		/// <returns></returns>
-		int ProcessSnapCoord(int position) const;
 
 #pragma region GUI Element Creation
 		/// <summary>
@@ -279,21 +231,6 @@ namespace RTEGUI {
 		void ProcessKeyboardInput();
 #pragma endregion
 
-#pragma region Drawing
-		/// <summary>
-		/// Draws the selection box around the selected control.
-		/// </summary>
-		/// <param name="Control">GUI element to draw selection box around.</param>
-		void DrawSelectionBox(GUIControl *control);
-
-		/// <summary>
-		/// Draws a selection box resize handle.
-		/// </summary>
-		/// <param name="X">X position of drawn box.</param>
-		/// <param name="Y">Y position of drawn box.</param>
-		void DrawSelectionResizeBox(int xPos, int yPos) const;
-#pragma endregion
-
 		// Disallow the use of some implicit methods.
 		EditorApp(const EditorApp &reference) = delete;
 		EditorApp &operator=(const EditorApp &rhs) = delete;