PROMS/Volian.Controls.Library/StepTabRibbon.cs

@@ -1395,18 +1395,21 @@ namespace Volian.Controls.Library
 			TablePicker tpdlg = new TablePicker();
 			tpdlg.Location = pt;
 			tpdlg.Left = left;
-			tpdlg.Show();
+			DialogResult dr = tpdlg.ShowDialog();
 			while (tpdlg.Visible)
 			{
 				Application.DoEvents();
 				System.Threading.Thread.Sleep(0);
 			}
-			if (!tpdlg.Cancel)
+			if (dr != DialogResult.Cancel) //!tpdlg.Cancel)
 			{
 				// Create a new grid to store the selected size
 				grd = new VlnFlexGrid();
 				grd.Rows.Count = tpdlg.SelectedRows;
 				grd.Cols.Count = tpdlg.SelectedColumns;
+				VE_Font vefont = MyItemInfo.ActiveFormat.PlantFormat.FormatData.StepDataList.Table.Font;
+				Font GridFont = new Font(vefont.Family, (float)vefont.Size);
+				grd.Font = GridFont;
 			}
 			return grd;
 		}