"Upgraded Script Window to be extendable | reloadPlayer doesnt collapse folders anymore"

Author: CookieLandProjects

GeneralsMD/Code/GameEngine/Include/GameLogic/Scripts.h

@@ -1264,6 +1264,7 @@ class ScriptList : public MemoryPoolObject, public Snapshot
 
 	static ScriptList *s_readLists[MAX_PLAYER_COUNT];
 	static Int				s_numInReadList;
+	std::vector<ScriptGroup*> m_markedChildrenForMove;
 
 public:
 	ScriptList();

GeneralsMD/Code/GameEngine/Source/GameLogic/ScriptEngine/Scripts.cpp

@@ -660,17 +660,27 @@ void ScriptList::deleteGroup(ScriptGroup *pGrp)
 		return;
 	}
 
+	std::vector<std::vector<Int>> children(count);
+	for (Int i = 0; i < count; ++i) {
+		Int parent = groups[i]->getParentIndex();
+		if (parent >= 0 && parent < count) {
+			children[parent].push_back(i);
+		}
+	}
+
 	// Mark all groups that are in the subtree rooted at targetIndex for deletion.
 	std::vector<char> toDelete(count, 0);
+	std::vector<Int> stack;
+	stack.push_back(targetIndex);
 	toDelete[targetIndex] = 1;
-	for (Int i = 0; i < count; ++i) {
-		if (toDelete[i]) continue;
-		Int cur = i;
-		while (cur != -1) {
-			Int parent = groups[cur]->getParentIndex();
-			if (parent == targetIndex) { toDelete[i] = 1; break; }
-			if (parent < 0 || parent >= count) break;
-			cur = parent;
+	while (!stack.empty()) {
+		Int cur = stack.back();
+		stack.pop_back();
+		for (Int child : children[cur]) {
+			if (!toDelete[child]) {
+				toDelete[child] = 1;
+				stack.push_back(child);
+			}
 		}
 	}
 

GeneralsMD/Code/Tools/WorldBuilder/include/ScriptDialog.h

@@ -166,8 +166,27 @@ class ScriptDialog : public CDialog
 
 	afx_msg void OnMoveUp();
 	afx_msg void OnMoveDown();
+	afx_msg void OnSize(UINT nType, int cx, int cy);
+	void OnGetMinMaxInfo(MINMAXINFO * lpMMI);
+
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
+	struct CtrlInfo {
+		int id;
+		CRect rc;           // initial rect in client coords (left,top,right,bottom)
+		int offsetRight;    // initial clientWidth - rc.right
+		int offsetBottom;   // initial clientHeight - rc.bottom
+
+		bool anchorRight;
+		bool stretchH;
+		bool stretchV;
+		bool anchorBottom;
+	};
+	std::vector<CtrlInfo> m_ctrlInfo;
+	CRect m_initialClientRect;
+	int m_rightColumnLeft;
+	int m_rightColumnWidth;
+	bool m_layoutInited;
 };
 
 //{{AFX_INSERT_LOCATION}}

GeneralsMD/Code/Tools/WorldBuilder/res/WorldBuilder.rc

@@ -935,7 +935,8 @@ BEGIN
 END
 
 IDD_ScriptDialog DIALOGEX 0, 0, 460, 327
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
+//STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_THICKFRAME
 CAPTION "Scripts"
 FONT 8, "MS Sans Serif", 0, 0, 0x1
 BEGIN
@@ -946,7 +947,7 @@ BEGIN
     PUSHBUTTON      "Up",IDC_MOVE_UP,403,118,25,14
     PUSHBUTTON      "Down",IDC_MOVE_DOWN,428,118,25,14
 
-    PUSHBUTTON      "&Copy Script",IDC_COPY_SCRIPT,403,136,50,14
+    PUSHBUTTON      "&Duplicate",IDC_COPY_SCRIPT,403,136,50,14
     PUSHBUTTON      "&Delete",IDC_DELETE,403,152,50,14
     PUSHBUTTON      "Import Scripts...",IDC_LOAD,386,309,60,14
     PUSHBUTTON      "Export Script(s)...",IDC_SAVE,317,309,60,14