A slightly more robust system for crop margins

Author: YellowAfterlife

CropMargins.cs

@@ -13,25 +13,67 @@ public struct CropMargins {
 			new CropMargins("Standard", 8, 32, 8, 8),
 			new CropMargins("Browser", 2, 39, 2, 2),
 		};
+		public static List<CropMargins> Special = new List<CropMargins>() {
+			new CropMargins("Special: Auto-Crop\u2122", GetAutoCropMargins),
+		};
+
+		/// <summary>Contributed by @Spitfire_x86</summary>
+		private static CropMarginsResult GetAutoCropMargins(DeckWindow window) {
+			var handle = window.Handle;
+			var style = (uint)WinAPI.GetWindowLong(handle, WinAPI_GWL.GWL_STYLE);
+			var exStyle = (uint)WinAPI.GetWindowLong(handle, WinAPI_GWL.GWL_EXSTYLE);
+
+			var rect = new WinAPI_Rect(0, 0, 0, 0);  // we just want margins, so adjusted rect is 0
+			WinAPI.AdjustWindowRectEx(ref rect, style, false, exStyle);
+
+			// AdjustWindowRectEx adjusts the rect outwards, so left and top are negative
+			return new CropMarginsResult(-rect.Left, -rect.Top, rect.Right, rect.Bottom);
+		}
 
 		public string Name;
 		public int Top, Left, Right, Bottom;
+		public Func<DeckWindow, CropMarginsResult> Func;
 		public CropMargins(string name) {
 			Name = name;
 			Top = 0;
 			Left = 0;
 			Right = 0;
 			Bottom = 0;
+			Func = null;
 		}
 		public CropMargins(string name, int left, int top, int right, int bottom) { 
 			Name = name;
 			Left = left;
 			Top = top;
 			Right = right;
 			Bottom = bottom;
+			Func = null;
+		}
+		public CropMargins(string name, Func<DeckWindow, CropMarginsResult> func) {
+			Name = name;
+			Left = 0;
+			Top = 0;
+			Right = 0;
+			Bottom = 0;
+			Func = func;
 		}
-		
+
 		// just so we don't have a hardcoded string in 5 different places
 		public static readonly string AutoCropName = "Auto";
 	}
+	public struct CropMarginsResult {
+		public int Top, Left, Right, Bottom;
+		public CropMarginsResult(int left, int top, int right, int bottom) {
+			Left = left;
+			Top = top;
+			Right = right;
+			Bottom = bottom;
+		}
+		public CropMarginsResult(CropMargins m) {
+			Left = m.Left;
+			Top = m.Top;
+			Right = m.Right;
+			Bottom = m.Bottom;
+		}
+	}
 }

DeckColumn.cs

@@ -24,7 +24,6 @@ public class DeckColumn : Panel {
 		public ToolStripTextBox TfName;
 		public DeckWindow Window = null;
 		public CropMargins CropMargins = CropMargins.Zero;
-		public bool ShouldAutoCrop = false;
 		public Panel WindowCtr;
 		public ToolStripSpringLabel TlName;
 		public Point OverlaySize = new Point(0, 0);
@@ -80,6 +79,7 @@ public void ChangeName(string newName) {
 			MainForm.FlushConfig();
 		}
 		public static Image LoadImage(string path) {
+			// doing Image.FromFile locks the file and then we can't delete it along with the column
 			var bytes = File.ReadAllBytes(path);
 			var stream = new MemoryStream(bytes);
 			return Image.FromStream(stream);
@@ -119,32 +119,43 @@ public void HideOverlay() {
 		private void TmPadding_Init() {
 			TbPadding = new ToolStripDropDownButton("Crop...", Resources.shape_handles);
 			TbPadding.DisplayStyle = ToolStripItemDisplayStyle.Image;
+			TbPadding.DropDownOpening += TmPadding_DropDownOpening;
 			TmPadding_Build();
 		}
-
-		public void TmPadding_Build() {
-			TbPadding.DropDownItems.Clear();
-			foreach (var m in MainForm.CropMargins) {
-				var tb = new ToolStripButton(m.Name);
-				tb.TextAlign = ContentAlignment.MiddleLeft;
-				//tb.AutoSize = true;
-				tb.Width = 80;
-				tb.Click += (object sender, EventArgs e) => {
-					CropMargins = m;
-					ShouldAutoCrop = false; // window should not auto-crop
-					Window?.Update();
-					MainForm.FlushConfig();
-				};
-				TbPadding.DropDownItems.Add(tb);
+		private void TmPadding_DropDownOpening(object sender, EventArgs e) {
+			var cmName = CropMargins.Name;
+			foreach (var item in TbPadding.DropDownItems) {
+				if (!(item is DeckColumnMarginButton bt)) continue;
+				bt.Checked = bt.Text == cmName;// ? CheckState.Checked : CheckState.Unchecked;
 			}
-
-			var tbAuto = new ToolStripButton("Auto-Crop\u2122");
-			tbAuto.Click += (sender, args) => {
-				ShouldAutoCrop = true; // window should auto-crop, see DeckWindow.GetAutoCropMargins()
+		}
+		private void TmPadding_Build_Margin(CropMargins m) {
+			var tb = new DeckColumnMarginButton();
+			tb.TextAlign = ContentAlignment.MiddleLeft;
+			//tb.AutoSize = true; // doesn't work..?
+			tb.Width = 120;
+			tb.Text = m.Name;
+			tb.Click += (sender, e) => {
+				CropMargins = m;
 				Window?.Update();
 				MainForm.FlushConfig();
 			};
-			TbPadding.DropDownItems.Add(tbAuto);
+			TbPadding.DropDownItems.Add(tb);
+		}
+		public void TmPadding_Build() {
+			TbPadding.DropDownItems.Clear();
+			foreach (var m in MainForm.CropMargins) TmPadding_Build_Margin(m);
+
+			TbPadding.DropDownItems.Add(new ToolStripSeparator());
+			foreach (var m in CropMargins.Special) TmPadding_Build_Margin(m);
+
+			TbPadding.DropDownItems.Add(new ToolStripSeparator());
+			var tbEdit = new ToolStripButton("Add/edit margins");
+			tbEdit.Name = "Edit";
+			tbEdit.Click += (sender, args) => {
+				MainForm.TbConfig_Click(sender, args);
+			};
+			TbPadding.DropDownItems.Add(tbEdit);
 		}
 
 		private void TbConfig_Init() {
@@ -162,7 +173,7 @@ private void TbConfig_Init() {
 			TbConfig.DropDownItems.Add(TfName);
 
 			var tbIcon = new ToolStripButton("Change icon", Resources.pencil);
-			tbIcon.Click += (object sender, EventArgs e) => {
+			tbIcon.Click += (sender, e) => {
 				MainForm.OnIconPick = (string path) => {
 					if (IconName != "") {
 						if (File.Exists(IconPath)) File.Delete(IconPath);
@@ -181,7 +192,7 @@ private void TbConfig_Init() {
 			TbConfig.DropDownItems.Add(tbIcon);
 
 			var tbLeft = new ToolStripButton("Move left", Resources.arrow_left);
-			tbLeft.Click += (object sender, EventArgs e) => {
+			tbLeft.Click += (sender, e) => {
 				var ind = MainForm.PanCtr.Controls.GetChildIndex(this);
 				if (ind < MainForm.PanCtr.Controls.Count - 1) {
 					MainForm.PanCtr.Controls.SetChildIndex(this, ind + 1);
@@ -192,7 +203,7 @@ private void TbConfig_Init() {
 			TbConfig.DropDownItems.Add(tbLeft);
 
 			var tbRight = new ToolStripButton("Move Right", Resources.arrow_right);
-			tbRight.Click += (object sender, EventArgs e) => {
+			tbRight.Click += (sender, e) => {
 				var ind = MainForm.PanCtr.Controls.GetChildIndex(this);
 				if (ind > 0) {
 					MainForm.PanCtr.Controls.SetChildIndex(this, ind - 1);
@@ -203,7 +214,7 @@ private void TbConfig_Init() {
 			TbConfig.DropDownItems.Add(tbRight);
 
 			var tbDelete = new ToolStripButton("Remove", Resources.delete);
-			tbDelete.Click += (object sender, EventArgs e) => {
+			tbDelete.Click += (sender, e) => {
 				if (MessageBox.Show(
 					"Are you sure you want to delete this column? This cannot be undone!",
 					MainForm.Text, MessageBoxButtons.YesNo, MessageBoxIcon.Warning
@@ -269,4 +280,5 @@ public void UpdateCrop() {
 			Window?.Update();
 		}
 	}
+	public class DeckColumnMarginButton : ToolStripButton { }
 }

DeckState.cs

@@ -34,15 +34,12 @@ public void Acquire(MainForm form) {
 			foreach (var m in form.CropMargins) Margins.Add(m);
 			foreach (var pan in form.GetDeckColumns()) {
 				var cm = pan.CropMargins;
-				string cmName;
-				if (pan.ShouldAutoCrop) {
-					cmName = CropMargins.AutoCropName;
-				}
-				else {
-					cmName = cm.Name;
-					if (!MarginsContainName(Margins, cmName) && !MarginsContainName(HiddenMargins, cmName)) {
-						HiddenMargins.Add(cm);
-					}
+				var cmName = cm.Name;
+				if (!MarginsContainName(Margins, cmName)
+					&& !MarginsContainName(CropMargins.Special, cmName)
+					&& !MarginsContainName(HiddenMargins, cmName)
+				) {
+					HiddenMargins.Add(cm);
 				}
 				var cd = new ColumnData();
 				cd.Name = pan.ColumnName;
@@ -62,19 +59,19 @@ public void Apply(MainForm form) {
 			form.PanCtr.SuspendLayout();
 			foreach (var panState in Columns) {
 				var pan = new DeckColumn(form);
-				if (panState.CropStyle == CropMargins.AutoCropName) {
-					pan.ShouldAutoCrop = true;
-				}
-				else {
-					var cm = Margins.Where(m => m.Name == panState.CropStyle).FirstOrDefault();
-					if (cm.Name == null)
-					{
-						cm = HiddenMargins.Where(m => m.Name == panState.CropStyle).FirstOrDefault();
-						if (cm.Name == null) cm = CropMargins.Zero;
-					}
-					pan.CropMargins = cm;
-					pan.ShouldAutoCrop = false;
-				}
+
+				CropMargins cm;
+				do {
+					cm = Margins.Where(m => m.Name == panState.CropStyle).FirstOrDefault();
+					if (cm.Name != null) break;
+					cm = CropMargins.Special.Where(m => m.Name == panState.CropStyle).FirstOrDefault();
+					if (cm.Name != null) break;
+					cm = HiddenMargins.Where(m => m.Name == panState.CropStyle).FirstOrDefault();
+					if (cm.Name != null) break;
+					cm = CropMargins.Zero;
+				} while (false);
+				pan.CropMargins = cm;
+
 				pan.TfName.Text = pan.TlName.Text = pan.ColumnName = panState.Name;
 				if (panState.Icon != "") {
 					pan.IconName = panState.Icon;
@@ -98,7 +95,7 @@ public void Apply(MainForm form) {
 		public void Save() {
 			if (!Directory.Exists("config")) Directory.CreateDirectory("config");
 			var text = JsonConvert.SerializeObject(this, Formatting.Indented);
-			File.WriteAllText($"config/{Name}.json", text);
+			File.WriteAllText($"config/{Name}.json", text, Encoding.UTF8);
 		}
 
 		static bool MarginsContainName(List<CropMargins> list, string cmName) {

DeckWindow.cs

@@ -10,19 +10,21 @@ public class DeckWindow {
 		public DeckColumn Column;
 		public IntPtr Handle;
 		public WinAPI_Rect OrigRect = new WinAPI_Rect();
-		public CropMargins CropMargins {
-            get => (Column.ShouldAutoCrop)
-                ? GetAutoCropMargins()
-                : Column.CropMargins;
-        }
+		public CropMarginsResult GetCropMargins() {
+			var m = Column.CropMargins;
+			if (m.Func != null) {
+				return m.Func(this);
+			} else return new CropMarginsResult(m);
+		}
 
 		public DeckWindow(IntPtr hwnd, DeckColumn col) {
 			Handle = hwnd;
 			Column = col;
 			WinAPI.GetWindowRect(Handle, out OrigRect);
 		}
 		public int GetWidth() {
-			return OrigRect.Width - CropMargins.Left - CropMargins.Right;
+			var m = GetCropMargins();
+			return OrigRect.Width - m.Left - m.Right;
 		}
 		public void Insert() {
 			WinAPI.SetParent(Handle, Column.WindowCtr.Handle);
@@ -36,23 +38,11 @@ public void Update() {
 			var stripHeight = 0;//Panel.ToolStrip.Height;
 			var height = Column.WindowCtr.Height - stripHeight;
 			var width = Column.WindowCtr.Width;
+			var m = GetCropMargins();
 			WinAPI.SetWindowRect(Handle,
-				-CropMargins.Left, -CropMargins.Top + stripHeight,
-				width + CropMargins.Left + CropMargins.Right,
-				height + CropMargins.Top + CropMargins.Bottom);
+				-m.Left, -m.Top + stripHeight,
+				width + m.Left + m.Right,
+				height + m.Top + m.Bottom);
 		}
-
-        // get margins from winapi based on the current window styles (should crop just the client area)
-        private CropMargins GetAutoCropMargins()
-        {
-            uint style = (uint) WinAPI.GetWindowLong(Handle, WinAPI_GWL.GWL_STYLE);
-            uint exStyle = (uint) WinAPI.GetWindowLong(Handle, WinAPI_GWL.GWL_EXSTYLE);
-
-            WinAPI_Rect rect = new WinAPI_Rect(0, 0, 0, 0);  // we just want margins, so adjusted rect is 0
-            WinAPI.AdjustWindowRectEx(ref rect, style, false, exStyle);
-
-            // AdjustWindowRectEx adjusts the rect outwards, so left and top are negative
-            return new CropMargins(CropMargins.AutoCropName, -rect.Left, -rect.Top, rect.Right, rect.Bottom);
-        }
 	}
 }

Forms/MainForm.Designer.cs

@@ -183,7 +183,7 @@ private void MainForm_ResizeEnd(object sender, EventArgs e) {
 			}
 		}
 
-		private void TbConfig_Click(object sender, EventArgs e) {
+		public void TbConfig_Click(object sender, EventArgs e) {
 			if (ConfigForm == null) {
 				ConfigForm = new ConfigForm(this);
 				ConfigForm.Show();