readd palette selection to ui

Author: LeftofZen

Gui/MainForm.Designer.cs

@@ -11,6 +11,7 @@
 using Core.Objects.Sound;
 using Zenith.Core;
 using System.Text;
+using System.IO;
 
 namespace OpenLoco.ObjectEditor.Gui
 {
@@ -1091,25 +1092,28 @@ static IEnumerable<Bitmap> CreateImages(List<G1Element32> G1Elements, Color[] pa
 			return dstImg;
 		}
 
-		//void SelectNewPalette()
-		//{
-		//	using (var openFileDialog = new OpenFileDialog())
-		//	{
-		//		openFileDialog.InitialDirectory = Directory.GetCurrentDirectory();
-		//		openFileDialog.Filter = "Palette Image Files(*.png)|*.png|All files (*.*)|*.*";
-		//		openFileDialog.FilterIndex = 1;
-		//		openFileDialog.RestoreDirectory = true;
-
-		//		if (openFileDialog.ShowDialog() == DialogResult.OK)
-		//		{
-		//			model.PaletteFile = openFileDialog.FileName;
-		//			RefreshObjectUI();
-		//		}
-		//	}
-		//}
-
-		//void setPaletteToolStripMenuItem_Click(object sender, EventArgs e)
-		//	=> SelectNewPalette();
+		void SelectNewPalette()
+		{
+			using (var openFileDialog = new OpenFileDialog())
+			{
+				openFileDialog.InitialDirectory = Directory.GetCurrentDirectory();
+				openFileDialog.Filter = "Palette Image Files(*.png)|*.png|All files (*.*)|*.*";
+				openFileDialog.FilterIndex = 1;
+				openFileDialog.RestoreDirectory = true;
+
+				if (openFileDialog.ShowDialog() == DialogResult.OK && File.Exists(openFileDialog.FileName))
+				{
+					//model.PaletteFile = openFileDialog.FileName;
+					var paletteBitmap = (Bitmap)Image.FromFile(openFileDialog.FileName);
+					model.Palette = PaletteHelpers.PaletteFromBitmap(paletteBitmap);
+
+					RefreshObjectUI();
+				}
+			}
+		}
+
+		void loadPaletteToolStripMenuItem_Click(object sender, EventArgs e)
+			=> SelectNewPalette();
 
 		void RefreshObjectUI()
 		{

Gui/MainForm.cs

@@ -60,7 +60,7 @@ class MainFormModel
 		//	//}
 		//}
 
-		public Color[] Palette { get; private set; }
+		public Color[] Palette { get; set; }
 
 		public G1Dat? G1 { get; set; }
 

Gui/MainFormModel.cs

@@ -9,9 +9,9 @@ public static Color[] PaletteFromBitmap(Bitmap img)
 			var palette = new Color[256];
 			var rect = new Rectangle(0, 0, img.Width, img.Height);
 			var imgData = img.LockBits(rect, ImageLockMode.ReadOnly, PixelFormat.Format32bppArgb);
-			for (var y = 0; y < img.Width; ++y)
+			for (var y = 0; y < img.Height; ++y)
 			{
-				for (var x = 0; x < img.Height; ++x)
+				for (var x = 0; x < img.Width; ++x)
 				{
 					palette[(y * img.Height) + x] = ImageHelpers.GetPixel(imgData, x, y);
 				}