closes #124

Author: slavara

QuickNavigate/Forms/OpenRecentFilesForm.cs

@@ -12,14 +12,11 @@ namespace QuickNavigate.Forms
 {
     public sealed partial class OpenRecentFilesForm : Form
     {
-        [NotNull]
-        readonly Settings settings;
+        [NotNull] readonly Settings settings;
 
-        [NotNull]
-        readonly List<string> recentFiles;
+        [NotNull] readonly List<string> recentFiles;
 
-        [NotNull]
-        readonly List<string> openedFiles;
+        [NotNull] readonly List<string> openedFiles;
 
         public OpenRecentFilesForm([NotNull] Settings settings)
         {

QuickNavigate/Forms/OpenRecentProjectsForm.cs

@@ -13,37 +13,29 @@ namespace QuickNavigate.Forms
 {
     public sealed partial class OpenRecentProjectsForm : Form
     {
+        [NotNull] readonly Settings settings;
         [NotNull] [ItemNotNull] readonly List<string> recentProjects = ProjectManager.PluginMain.Settings.RecentProjects.Where(File.Exists).ToList();
 
         public OpenRecentProjectsForm([NotNull] Settings settings)
         {
+            this.settings = settings;
+            Font = PluginBase.Settings.DefaultFont;
             InitializeComponent();
+            if (settings.RecentProjectsSize.Width > MinimumSize.Width) Size = settings.RecentProjectsSize;
             InitializeTree();
+            InitializeContextMenu();
             InitializeTheme();
-            Settings = settings;
+            openInNewWindow.Visible = PluginBase.MainForm.MultiInstanceMode;
             RefrestTree();
         }
 
+        [CanBeNull] ContextMenuStrip contextMenu;
+
         public bool InNewWindow { get; private set; }
 
         [CanBeNull]
-        public string SelectedItem => tree?.SelectedNode.Text;
-
-        [NotNull] Settings settings;
-
-        [NotNull]
-        public Settings Settings
-        {
-            get { return settings; }
-            set
-            {
-                settings = value;
-                if (settings.RecentProjectsSize.Width > MinimumSize.Width) Size = settings.RecentProjectsSize;
-                Font = PluginBase.Settings.DefaultFont;
-                openInNewWindow.Visible = PluginBase.MainForm.MultiInstanceMode;
-            }
-        }
-
+        public string SelectedItem => tree.SelectedNode?.Text;
+        
         void InitializeTree()
         {
             tree.ImageList = new ImageList
@@ -55,6 +47,15 @@ void InitializeTree()
             tree.ItemHeight = tree.ImageList.ImageSize.Height;
         }
 
+        void InitializeContextMenu()
+        {
+            if (!PluginBase.MainForm.MultiInstanceMode) return;
+            input.ContextMenu = new ContextMenu();
+            contextMenu = new ContextMenuStrip {Renderer = new DockPanelStripRenderer(false)};
+            contextMenu.Items.Add("Open in new Window").Click += (s, args) => NavigateInNewWindow();
+            contextMenu.Items[0].Select();
+        }
+
         void InitializeTheme()
         {
             input.BackColor = PluginBase.MainForm.GetThemeColor("TextBox.BackColor", SystemColors.Window);
@@ -105,6 +106,21 @@ void Navigate()
             DialogResult = DialogResult.OK;
         }
 
+        void NavigateInNewWindow()
+        {
+            InNewWindow = SelectedItem != null;
+            Navigate();
+        }
+
+        void ShowContextMenu()
+        {
+            var selectedNode = tree.SelectedNode;
+            if (selectedNode == null) return;
+            ShowContextMenu(new Point(selectedNode.Bounds.X, selectedNode.Bounds.Bottom));
+        }
+
+        void ShowContextMenu([NotNull] Point position) => contextMenu?.Show(tree, position);
+
         protected override void OnKeyDown(KeyEventArgs e)
         {
             switch (e.KeyCode)
@@ -120,6 +136,10 @@ protected override void OnKeyDown(KeyEventArgs e)
                         input.SelectAll();
                     }
                     break;
+                case Keys.Apps:
+                    e.Handled = true;
+                    ShowContextMenu();
+                    break;
             }
         }
 
@@ -188,10 +208,6 @@ void OnTreeDrawNode(object sender, DrawTreeNodeEventArgs e)
             graphics.DrawString($"({path})", font, moduleBrush, x, bounds.Top, StringFormat.GenericDefault);
         }
 
-        void OnOpenInNewWindowClick(object sender, EventArgs e)
-        {
-            InNewWindow = SelectedItem != null;
-            Navigate();
-        }
+        void OnOpenInNewWindowClick(object sender, EventArgs e) => NavigateInNewWindow();
     }
 }

QuickNavigate/Forms/QuickOutlineForm.Designer.cs

@@ -14,15 +14,14 @@ namespace QuickNavigate.Forms
 {
     public sealed partial class QuickOutlineForm : Form
     {
-        [NotNull]
-        readonly Settings settings;
-        readonly ContextMenuStrip contextMenu = new ContextMenuStrip();
+        [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>();
         readonly Dictionary<Keys, Button> keysToFilter = new Dictionary<Keys, Button>();
         readonly Dictionary<Button, string> filterToEnabledTip = new Dictionary<Button, string>();
         readonly Dictionary<Button, string> filterToDisabledTip = new Dictionary<Button, string>();
-        readonly Dictionary<FlagType, Button> flagToFilter = new Dictionary<FlagType, Button>(); 
+        readonly Dictionary<FlagType, Button> flagToFilter = new Dictionary<FlagType, Button>();
 
         /// <summary>
         /// Initializes a new instance of the QuickNavigate.Controls.QuickOutlineForm
@@ -44,11 +43,9 @@ public QuickOutlineForm([NotNull] FileModel inFile, [CanBeNull] ClassModel inCla
             RefreshTree();
         }
 
-        [CanBeNull]
-        public event ShowInHandler ShowInClassHierarchy;
+        [CanBeNull] public event ShowInHandler ShowInClassHierarchy;
 
-        [CanBeNull]
-        ToolTip filterToolTip;
+        [CanBeNull] ToolTip filterToolTip;
 
         [NotNull]
         public FileModel InFile { get; }
@@ -242,7 +239,7 @@ void RefreshFilterTip(Button filter)
         protected override void OnKeyDown(KeyEventArgs e)
         {
             var keyCode = e.KeyCode;
-            if (keysToFilter.ContainsKey(keyCode) && e.Alt)
+            if (e.Alt && keysToFilter.ContainsKey(keyCode))
             {
                 CurrentFilter = keysToFilter[keyCode];
                 return;