From b7ebcaa7fa91fed9b29b1dceb12ba145d8646169 Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Mon, 10 May 2010 21:05:46 +1200
Subject: [PATCH] blah

---
 OpenRA.Editor/Form1.Designer.cs | 27 +++++++++++++++------------
 OpenRA.Editor/Form1.cs          |  7 +++----
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/OpenRA.Editor/Form1.Designer.cs b/OpenRA.Editor/Form1.Designer.cs
index 003fbe6b13..3211ab8c7f 100644
--- a/OpenRA.Editor/Form1.Designer.cs
+++ b/OpenRA.Editor/Form1.Designer.cs
@@ -39,7 +39,6 @@
 			this.actorPalette = new System.Windows.Forms.FlowLayoutPanel();
 			this.tabPage3 = new System.Windows.Forms.TabPage();
 			this.resourcePalette = new System.Windows.Forms.FlowLayoutPanel();
-			this.surface1 = new OpenRA.Editor.Surface();
 			this.toolStrip1 = new System.Windows.Forms.ToolStrip();
 			this.toolStripButton3 = new System.Windows.Forms.ToolStripButton();
 			this.toolStripButton5 = new System.Windows.Forms.ToolStripButton();
@@ -49,6 +48,7 @@
 			this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
 			this.tt = new System.Windows.Forms.ToolTip(this.components);
 			this.folderBrowser = new System.Windows.Forms.FolderBrowserDialog();
+			this.surface1 = new OpenRA.Editor.Surface();
 			this.toolStripContainer1.ContentPanel.SuspendLayout();
 			this.toolStripContainer1.TopToolStripPanel.SuspendLayout();
 			this.toolStripContainer1.SuspendLayout();
@@ -125,6 +125,7 @@
 			// tilePalette
 			// 
 			this.tilePalette.AutoScroll = true;
+			this.tilePalette.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
 			this.tilePalette.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.tilePalette.Location = new System.Drawing.Point(3, 3);
 			this.tilePalette.Name = "tilePalette";
@@ -145,6 +146,7 @@
 			// actorPalette
 			// 
 			this.actorPalette.AutoScroll = true;
+			this.actorPalette.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
 			this.actorPalette.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.actorPalette.Location = new System.Drawing.Point(3, 3);
 			this.actorPalette.Name = "actorPalette";
@@ -164,22 +166,13 @@
 			// resourcePalette
 			// 
 			this.resourcePalette.AutoScroll = true;
+			this.resourcePalette.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
 			this.resourcePalette.Dock = System.Windows.Forms.DockStyle.Fill;
 			this.resourcePalette.Location = new System.Drawing.Point(0, 0);
 			this.resourcePalette.Name = "resourcePalette";
 			this.resourcePalette.Size = new System.Drawing.Size(171, 672);
 			this.resourcePalette.TabIndex = 3;
 			// 
-			// surface1
-			// 
-			this.surface1.BackColor = System.Drawing.Color.Black;
-			this.surface1.Dock = System.Windows.Forms.DockStyle.Fill;
-			this.surface1.Location = new System.Drawing.Point(0, 0);
-			this.surface1.Name = "surface1";
-			this.surface1.Size = new System.Drawing.Size(783, 680);
-			this.surface1.TabIndex = 2;
-			this.surface1.Text = "surface1";
-			// 
 			// toolStrip1
 			// 
 			this.toolStrip1.Dock = System.Windows.Forms.DockStyle.None;
@@ -192,7 +185,7 @@
             this.toolStripButton2});
 			this.toolStrip1.Location = new System.Drawing.Point(3, 0);
 			this.toolStrip1.Name = "toolStrip1";
-			this.toolStrip1.Size = new System.Drawing.Size(416, 25);
+			this.toolStrip1.Size = new System.Drawing.Size(385, 25);
 			this.toolStrip1.TabIndex = 0;
 			// 
 			// toolStripButton3
@@ -253,6 +246,16 @@
 			// 
 			this.tt.ShowAlways = true;
 			// 
+			// surface1
+			// 
+			this.surface1.BackColor = System.Drawing.Color.Black;
+			this.surface1.Dock = System.Windows.Forms.DockStyle.Fill;
+			this.surface1.Location = new System.Drawing.Point(0, 0);
+			this.surface1.Name = "surface1";
+			this.surface1.Size = new System.Drawing.Size(783, 680);
+			this.surface1.TabIndex = 2;
+			this.surface1.Text = "surface1";
+			// 
 			// Form1
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
diff --git a/OpenRA.Editor/Form1.cs b/OpenRA.Editor/Form1.cs
index 3086d33e51..016e73d1a9 100644
--- a/OpenRA.Editor/Form1.cs
+++ b/OpenRA.Editor/Form1.cs
@@ -36,13 +36,12 @@ namespace OpenRA.Editor
 		string currentMod = "ra";
 		TileSet tileset;
 
-		void LoadMap(string mod, string mapname)
+		void LoadMap(string mapname)
 		{
 			tilePalette.Controls.Clear();
 			actorPalette.Controls.Clear();
 			resourcePalette.Controls.Clear();
 
-			currentMod = mod;
 			loadedMapName = mapname;
 
 			var manifest = new Manifest(new[] { currentMod });
@@ -53,7 +52,7 @@ namespace OpenRA.Editor
 			foreach (var pkg in manifest.Packages) FileSystem.Mount(pkg);
 
 			// load the map
-			var map = new Map(new Folder("mods/{0}/maps/{1}".F(mod, mapname)));
+			var map = new Map(new Folder(mapname));
 
 			PrepareMapResources(manifest, map);
 		}
@@ -373,7 +372,7 @@ namespace OpenRA.Editor
 		{
 			folderBrowser.ShowNewFolderButton = true;
 			if (DialogResult.OK == folderBrowser.ShowDialog())
-				LoadMap(currentMod, Path.GetFileName(folderBrowser.SelectedPath));
+				LoadMap(folderBrowser.SelectedPath);
 		}
 
 		void NewClicked(object sender, EventArgs e)