Merged hotfix/QuickOutline_size into master

SlavaRa · Jul 27, 2016 · f77a0cb · f77a0cb
2 parents 1a53373 + 0045bed
commit f77a0cb
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/QuickNavigate/Forms/QuickOutlineForm.cs b/QuickNavigate/Forms/QuickOutlineForm.cs
@@ -13,7 +13,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>();
@@ -28,13 +27,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();
@@ -228,6 +225,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;
@@ -259,7 +262,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();