WIP

Author: SlavaRa

QuickNavigate/Forms/ClassHierarchyForm.cs

@@ -62,9 +62,7 @@ static IEnumerable<ClassModel> GetExtends([NotNull] ClassModel theClass)
         public ClassHierarchyForm([NotNull] ClassModel model, [NotNull] Settings settings) : base(settings)
         {
             curClass = model;
-            Font = PluginBase.Settings.DefaultFont;
             InitializeComponent();
-            if (settings.HierarchyExplorerSize.Width > MinimumSize.Width) Size = settings.HierarchyExplorerSize;
             extendsToClasses = GetAllProjectExtendsClasses();
             InitializeTree();
             InitializeTheme();
@@ -214,6 +212,18 @@ protected override void Navigate()
 
         #region Event Handlers
 
+        protected override void OnShown(EventArgs e)
+        {
+            base.OnShown(e);
+            if (Settings != null && Settings.HierarchyExplorerSize.Width > MinimumSize.Width) Size = Settings.HierarchyExplorerSize;
+        }
+
+        protected override void OnFormClosing(FormClosingEventArgs e)
+        {
+            if (Settings == null) return;
+            Settings.HierarchyExplorerSize = Size;
+        }
+
         protected override void OnKeyDown(KeyEventArgs e)
         {
             switch (e.KeyCode)
@@ -239,8 +249,6 @@ protected override void OnKeyDown(KeyEventArgs e)
             }
         }
 
-        protected override void OnFormClosing(FormClosingEventArgs e) => Settings.HierarchyExplorerSize = Size;
-
         protected override void OnTreeNodeMouseClick(object sender, TreeNodeMouseClickEventArgs e)
         {
             var node = e.Node as TypeNode;
@@ -290,7 +298,7 @@ void OnInputTextChanged(object sender, EventArgs e)
 
         void OnInputPreviewKeyDown(object sender, PreviewKeyDownEventArgs e)
         {
-            if (e.KeyCode == Keys.Apps) input.ContextMenu = SelectedNode != null ? InputEmptyContextMenu : null;
+            if (e.KeyCode == Keys.Apps) input.ContextMenu = SelectedNode != null ? FormHelper.EmptyContextMenu : null;
         }
 
         void OnInputKeyDown(object sender, KeyEventArgs e)

QuickNavigate/Forms/ClassModelExplorerForm.cs

@@ -8,30 +8,10 @@ namespace QuickNavigate.Forms
     public class ClassModelExplorerForm : QuickForm
     {
         [NotNull] protected readonly Settings Settings;
-        [NotNull] protected readonly ContextMenu InputEmptyContextMenu = new ContextMenu();
 
         public ClassModelExplorerForm([NotNull] Settings settings)
         {
             Settings = settings;
-            InitializeContextMenu();
-        }
-
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                InputEmptyContextMenu.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        protected virtual void InitializeContextMenu()
-        {
-            ContextMenuStrip = new ContextMenuStrip {Renderer = new DockPanelStripRenderer(false)};
-        }
-        
-        protected virtual void Navigate()
-        {
         }
 
         /// <summary>

QuickNavigate/Forms/QuickOutlineForm.cs

@@ -34,7 +34,6 @@ public QuickOutlineForm([NotNull] FileModel inFile, [CanBeNull] ClassModel inCla
             InFile = inFile;
             InClass = inClass ?? ClassModel.VoidClass;
             this.settings = settings;
-            Font = PluginBase.Settings.DefaultFont;
             InitializeComponent();
             if (settings.QuickOutlineSize.Width > MinimumSize.Width) Size = settings.QuickOutlineSize;
             InitializeTree();
@@ -168,7 +167,7 @@ void AddMembers(TreeNodeCollection nodes, MemberList members, bool isHaxe, bool
                 tree.SelectedNode = nodes[0];
         }
 
-        void Navigate()
+        protected override void Navigate()
         {
             if (SelectedNode != null) DialogResult = DialogResult.OK;
         }

QuickNavigate/Forms/TypeExplorerForm.cs

@@ -34,17 +34,11 @@ public sealed partial class TypeExplorerForm : ClassModelExplorerForm
         /// <param name="settings"></param>
         public TypeExplorerForm([NotNull] Settings settings) : base(settings)
         {
-            Font = PluginBase.Settings.DefaultFont;
             InitializeComponent();
-            if (settings.TypeExplorerSize.Width > MinimumSize.Width) Size = settings.TypeExplorerSize;
-            searchingInExternalClasspaths.Checked = settings.TypeExplorerSearchExternalClassPath;
             CreateItemsList();
             InitializeTree();
             InitializeTheme();
             RefreshTree();
-            timer.Interval = PluginBase.MainForm.Settings.DisplayDelay;
-            timer.Tick += OnTimerTick;
-            timer.Start();
         }
 
         [CanBeNull] ToolTip filterToolTip;
@@ -335,7 +329,20 @@ protected override void OnKeyDown(KeyEventArgs e)
                     break;
             }
         }
-        
+
+        protected override void OnShown(EventArgs e)
+        {
+            base.OnShown(e);
+            if (Settings != null)
+            {
+                if (Settings.TypeExplorerSize.Width > MinimumSize.Width) Size = Settings.TypeExplorerSize;
+                searchingInExternalClasspaths.Checked = Settings.TypeExplorerSearchExternalClassPath;
+            }
+            timer.Interval = PluginBase.MainForm.Settings.DisplayDelay;
+            timer.Tick += OnTimerTick;
+            timer.Start();
+        }
+
         protected override void OnFormClosing(FormClosingEventArgs e)
         {
             timer.Stop();
@@ -398,7 +405,7 @@ void OnTreeDrawNode(object sender, DrawTreeNodeEventArgs e)
 
         void OnInputPreviewKeyDown(object sender, PreviewKeyDownEventArgs e)
         {
-            if (e.KeyCode == Keys.Apps) input.ContextMenu = SelectedNode != null ? InputEmptyContextMenu : null;
+            if (e.KeyCode == Keys.Apps) input.ContextMenu = SelectedNode != null ? FormHelper.EmptyContextMenu : null;
         }
 
         void OnInputKeyDown(object sender, KeyEventArgs e)

QuickNavigate/Helpers/FormHelper.cs

@@ -18,10 +18,16 @@ public abstract class QuickForm : Form
         /// The currently selected tree node, or null if nothing is selected.
         /// </summary>
         [CanBeNull] public virtual TreeNode SelectedNode { get; }
+
+        protected virtual void Navigate()
+        {
+        }
     }
 
     class FormHelper
     {
+        [NotNull] internal static readonly ContextMenu EmptyContextMenu = new ContextMenu();
+
         public static bool IsFileOpened([NotNull] string fileName)
         {
             return PluginBase.MainForm.Documents.Any(it => it.FileName == fileName);

QuickNavigate/PluginMain.cs

@@ -434,7 +434,12 @@ void OnFormKeyUp(object sender, KeyEventArgs e)
             ((Control) PluginBase.MainForm).BeginInvoke(invoker);
         }
 
-        void OnFormShown(object sender, EventArgs eventArgs) => openedForm = (QuickForm)sender;
+        void OnFormShown(object sender, EventArgs eventArgs)
+        {
+            openedForm = (QuickForm) sender;
+            openedForm.Font = PluginBase.Settings.DefaultFont;
+            openedForm.ContextMenuStrip = new ContextMenuStrip {Renderer = new DockPanelStripRenderer(false)};
+        }
 
         void OnFormClosing(object sender, CancelEventArgs cancelEventArgs) => openedForm = null;