From 5dda164269ef4d64cdf36a5b8a7a3ef671e94dec Mon Sep 17 00:00:00 2001
From: slavara <ratdg@ya.ru>
Date: Wed, 27 Jul 2016 12:17:54 +0300
Subject: [PATCH 1/2] fixes QuickOulineForm.Size

---
 QuickNavigate/Forms/QuickOutlineForm.cs | 13 ++++++++-----
 QuickNavigate/Forms/TypeExplorerForm.cs |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/QuickNavigate/Forms/QuickOutlineForm.cs b/QuickNavigate/Forms/QuickOutlineForm.cs
index f8f931e..422b92c 100644
--- a/QuickNavigate/Forms/QuickOutlineForm.cs
+++ b/QuickNavigate/Forms/QuickOutlineForm.cs
@@ -14,7 +14,6 @@ namespace QuickNavigate.Forms
 {
     public sealed partial class QuickOutlineForm : QuickForm
     {
-        [NotNull] readonly Settings settings;
         readonly ContextMenuStrip contextMenu = new ContextMenuStrip { Renderer = new DockPanelStripRenderer(false) };
         readonly ContextMenu inputEmptyContextMenu = new ContextMenu();
         readonly List<Button> filters = new List<Button>();
@@ -29,13 +28,11 @@ public sealed partial class QuickOutlineForm : QuickForm
         /// <param name="inFile"></param>
         /// <param name="inClass"></param>
         /// <param name="settings"></param>
-        public QuickOutlineForm([NotNull] FileModel inFile, [CanBeNull] ClassModel inClass, [NotNull] Settings settings)
+        public QuickOutlineForm([NotNull] FileModel inFile, [CanBeNull] ClassModel inClass, [NotNull] Settings settings) : base(settings)
         {
             InFile = inFile;
             InClass = inClass ?? ClassModel.VoidClass;
-            this.settings = settings;
             InitializeComponent();
-            if (settings.QuickOutlineSize.Width > MinimumSize.Width) Size = settings.QuickOutlineSize;
             InitializeTree();
             InitializeTheme();
             RefreshTree();
@@ -226,6 +223,12 @@ void RefreshFilterTip(Button filter)
 
         #region Event Handlers
 
+        protected override void OnShown(EventArgs e)
+        {
+            base.OnShown(e);
+            if (Settings != null && Settings.QuickOutlineSize.Width > MinimumSize.Width) Size = Settings.QuickOutlineSize;
+        }
+
         protected override void OnKeyDown(KeyEventArgs e)
         {
             var keyCode = e.KeyCode;
@@ -257,7 +260,7 @@ protected override void OnKeyDown(KeyEventArgs e)
             }
         }
 
-        protected override void OnFormClosing(FormClosingEventArgs e) => settings.QuickOutlineSize = Size;
+        protected override void OnFormClosing(FormClosingEventArgs e) => Settings.QuickOutlineSize = Size;
 
         void OnInputTextChanged(object sender, EventArgs e) => RefreshTree();
 
diff --git a/QuickNavigate/Forms/TypeExplorerForm.cs b/QuickNavigate/Forms/TypeExplorerForm.cs
index 8ab6755..e89a3bb 100644
--- a/QuickNavigate/Forms/TypeExplorerForm.cs
+++ b/QuickNavigate/Forms/TypeExplorerForm.cs
@@ -26,7 +26,7 @@ public sealed partial class TypeExplorerForm : QuickForm
         [NotNull] readonly Dictionary<Button, string> filterToDisabledTip = new Dictionary<Button, string>();
         [NotNull] readonly Dictionary<FlagType, Button> flagToFilter = new Dictionary<FlagType, Button>();
         [NotNull] readonly Timer timer = new Timer();
-        private int filesCount;
+        int filesCount;
 
         /// <summary>
         /// Initializes a new instance of the QuickNavigate.Controls.TypeExplorer

From 0045bed7acb260b329211270010806bd18c50531 Mon Sep 17 00:00:00 2001
From: slavara <ratdg@ya.ru>
Date: Wed, 27 Jul 2016 12:17:54 +0300
Subject: [PATCH 2/2] fixes QuickOulineForm.Size