replaced FileDialog.ShowDialog() logic to Shown event

Meragon · Nov 24, 2016 · 764b9bf · 764b9bf
1 parent 6e00237
commit 764b9bf
Showing 1 changed file with 20 additions and 21 deletions.
diff --git a/System/Windows/Forms/FileDialog.cs b/System/Windows/Forms/FileDialog.cs
@@ -203,8 +203,28 @@ public FileDialog()
             };
 
             fileRender.filesTree.NodeMouseClick += filesTree_NodeMouseClick;
+
+            this.Shown += FileDialog_Shown;
         }
 
+        private void FileDialog_Shown(object sender, EventArgs e)
+        {
+            var fs = Filter.Split('|');
+            for (int i = 0; i < fs.Length; i += 2)
+                comboFilter.Items.Add(fs[i]);
+
+            if (comboFilter.Items.Count > 0)
+            {
+                comboFilter.SelectedIndex = 0;
+                comboFilter.SelectedIndexChanged += (s, a) =>
+                {
+                    fileRender.SetDirectory(fileRender.currentPath);
+                };
+            }
+
+            fileRender.SetDirectory(fileRender.currentPath);
+
+        }
         protected virtual void filesTree_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e)
         {
             if (e.Button == MouseButtons.Right)
@@ -240,27 +260,6 @@ protected override void OnPaint(PaintEventArgs e)
             base.OnPaint(e);
             e.Graphics.DrawLine(new Pen(BorderColor), 1, HeaderHeight, Width - 1, HeaderHeight);
         }
-        public new DialogResult ShowDialog()
-        {
-            var fs = Filter.Split('|');
-            for (int i = 0; i < fs.Length; i += 2)
-                comboFilter.Items.Add(fs[i]);
-
-            if (comboFilter.Items.Count > 0)
-            {
-                comboFilter.SelectedIndex = 0;
-                comboFilter.SelectedIndexChanged += (sender, args) =>
-                {
-                    fileRender.SetDirectory(fileRender.currentPath);
-                };
-            }
-
-            fileRender.SetDirectory(fileRender.currentPath);
-
-            base.ShowDialog();
-
-            return Forms.DialogResult.None;
-        }
 
         protected void OpenFile()
         {