优化代码

HuWenjin · Aug 28, 2021 · 5b89cd8 · 5b89cd8
1 parent f8f530c
commit 5b89cd8
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 18 deletions.
diff --git a/ContextMenuManager/BluePointLilac.Controls/MyListBox.cs b/ContextMenuManager/BluePointLilac.Controls/MyListBox.cs
@@ -113,8 +113,12 @@ public virtual void ClearItems()
         {
             if(this.Controls.Count == 0) return;
             this.SuspendLayout();
-            foreach(Control control in this.Controls) BeginInvoke(new Action(control.Dispose));
-            this.Controls.Clear();
+            for(int i = this.Controls.Count - 1; i >= 0; i--)
+            {
+                Control ctr = this.Controls[i];
+                this.Controls.Remove(ctr);
+                ctr.Dispose();
+            }
             this.ResumeLayout();
         }
 
@@ -154,9 +158,9 @@ public MyListItem()
             this.BackColor = Color.FromArgb(250, 250, 250);
             this.Controls.AddRange(new Control[] { lblSeparator, flpControls, lblText, picImage });
             this.Resize += (Sender, e) => pnlScrollbar.Height = this.ClientSize.Height;
-            flpControls.MouseClick += (sender, e) => this.OnMouseClick(null);
-            flpControls.MouseEnter += (sender, e) => this.OnMouseEnter(null);
-            flpControls.MouseDown += (sender, e) => this.OnMouseDown(null);
+            flpControls.MouseClick += (sender, e) => this.OnMouseClick(e);
+            flpControls.MouseEnter += (sender, e) => this.OnMouseEnter(e);
+            flpControls.MouseDown += (sender, e) => this.OnMouseDown(e);
             lblSeparator.SetEnabled(false);
             lblText.SetEnabled(false);
             CenterControl(lblText);
@@ -263,8 +267,8 @@ public void AddCtr(Control ctr, int space)
             this.SuspendLayout();
             ctr.Parent = flpControls;
             ctr.Margin = new Padding(0, 0, space, 0);
-            ctr.MouseEnter += (sender, e) => this.OnMouseEnter(null);
-            ctr.MouseDown += (sender, e) => this.OnMouseEnter(null);
+            ctr.MouseEnter += (sender, e) => this.OnMouseEnter(e);
+            ctr.MouseDown += (sender, e) => this.OnMouseEnter(e);
             CenterControl(ctr);
             this.ResumeLayout();
         }

diff --git a/ContextMenuManager/BluePointLilac.Controls/ReadOnlyTextBox.cs b/ContextMenuManager/BluePointLilac.Controls/ReadOnlyTextBox.cs
@@ -14,7 +14,8 @@ public ReadOnlyTextBox()
             this.ShortcutsEnabled = false;
             this.BackColor = Color.White;
             this.ForeColor = Color.FromArgb(80, 80, 80);
-            this.Font = new Font(SystemFonts.MenuFont.FontFamily, 10F);
+            this.Font = SystemFonts.MenuFont;
+            this.Font = new Font(this.Font.FontFamily, this.Font.Size + 1F);
         }
 
         const int WM_SETFOCUS = 0x0007;
@@ -48,7 +49,8 @@ public ReadOnlyRichTextBox()
             this.BackColor = Color.White;
             this.BorderStyle = BorderStyle.None;
             this.ForeColor = Color.FromArgb(80, 80, 80);
-            this.Font = new Font(SystemFonts.MenuFont.FontFamily, 10F);
+            this.Font = SystemFonts.MenuFont;
+            this.Font = new Font(this.Font.FontFamily, this.Font.Size + 1F);
         }
 
         const int WM_SETFOCUS = 0x0007;

diff --git a/ContextMenuManager/BluePointLilac.Methods/FormExtension.cs b/ContextMenuManager/BluePointLilac.Methods/FormExtension.cs
@@ -6,6 +6,8 @@ namespace BluePointLilac.Methods
     public static class FormExtension
     {
         /// <summary>移动窗体时同时移动另一个窗体</summary>
+        /// <param name="frm1">主动移动的窗体</param>
+        /// <param name="frm2">同时被移动的窗体</param>
         public static void MoveAsMove(this Form frm1, Form frm2)
         {
             if(frm2 == null) return;
@@ -21,6 +23,8 @@ public static void MoveAsMove(this Form frm1, Form frm2)
         }
 
         /// <summary>给窗体添加ESC键关闭功能</summary>
+        /// <param name="frm">指定窗口</param>
+        /// <param name="dr">关闭窗口时的对话框返回值</param>
         /// <remarks>也可以重写Form的ProcessDialogKey事件，
         /// 这个方法更简单，但遍历窗体控件时切记多了一个不可见的关闭按钮</remarks>
         public static void AddEscapeButton(this Form frm, DialogResult dr = DialogResult.Cancel)

diff --git a/ContextMenuManager/Controls/EnhanceMenusItem.cs b/ContextMenuManager/Controls/EnhanceMenusItem.cs
@@ -170,6 +170,7 @@ private static string CreateCommandFile(XmlNode xe)
 
     sealed class EnhanceShellExItem : FoldSubItem, IChkVisibleItem
     {
+        public string RegPath => $@"{ShellExPath}\ContextMenuHandlers\{DefaultKeyName}";
         public string ShellExPath { get; set; }
         public string DefaultKeyName { get; set; }
         public Guid Guid { get; set; }
@@ -182,8 +183,7 @@ public bool ItemVisible
             {
                 if(value)
                 {
-                    string regPath = ObjectPath.GetNewPathWithIndex
-                    ($@"{ShellExPath}\ContextMenuHandlers\{DefaultKeyName}", ObjectPath.PathType.Registry);
+                    string regPath = ObjectPath.GetNewPathWithIndex(this.RegPath, ObjectPath.PathType.Registry);
                     Registry.SetValue(regPath, "", this.Guid.ToString("B"));
                 }
                 else

diff --git a/ContextMenuManager/Controls/FoldSubItem.cs b/ContextMenuManager/Controls/FoldSubItem.cs
@@ -81,7 +81,10 @@ public FoldGroupItem(string groupPath, PathType pathType)
             this.Font = new Font(this.Font, FontStyle.Bold);
             this.AddCtrs(new[] { btnFold, btnOpenPath });
             this.ContextMenuStrip.Items.AddRange(new[] { tsiFoldAll, tsiUnfoldAll });
-            this.MouseDown += (sender, e) => Fold();
+            this.MouseDown += (sender, e) =>
+            {
+                if(e.Button == MouseButtons.Left) Fold();
+            };
             btnFold.MouseDown += (sender, e) =>
             {
                 Fold();

diff --git a/ContextMenuManager/Controls/NewShellDialog.cs b/ContextMenuManager/Controls/NewShellDialog.cs
@@ -51,6 +51,7 @@ sealed class NewShellForm : NewItemForm
 
             static readonly string[] DirScenePaths = {
                 ShellList.MENUPATH_DIRECTORY,
+                ShellList.MENUPATH_BACKGROUND,
                 $@"{ShellList.SYSFILEASSPATH}\Directory."
             };
             static readonly string[] FileObjectsScenePaths = {

diff --git a/ContextMenuManager/Methods/AppConfig.cs b/ContextMenuManager/Methods/AppConfig.cs
@@ -168,8 +168,9 @@ public static DateTime LastCheckUpdateTime
                 }
                 catch
                 {
+                    return DateTime.MinValue;
                     //返回文件上次修改时间
-                    return new FileInfo(Application.ExecutablePath).LastWriteTime;
+                    //return new FileInfo(Application.ExecutablePath).LastWriteTime;
                 }
             }
             set => SetGeneralValue("LastCheckUpdateTime", value.ToBinary());

diff --git a/ContextMenuManager/Methods/Updater.cs b/ContextMenuManager/Methods/Updater.cs
@@ -65,7 +65,8 @@ private static void UpdateApp(bool isManual)
                     XmlNode bodyXN = root.SelectSingleNode("body");
                     string info = AppString.Message.UpdateInfo.Replace("%v1", appVer.ToString()).Replace("%v2", webVer.ToString());
                     info += "\r\n\r\n" + MachinedInfo(bodyXN.InnerText);
-                    if(AppMessageBox.Show(info, MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+                    if(MessageBox.Show(info, AppString.General.AppName, 
+                        MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
                     {
                         string netVer = Environment.Version > new Version(4, 0) ? "4.0" : "3.5";
                         XmlNode assetsXN = root.SelectSingleNode("assets");

diff --git a/ContextMenuManager/Properties/Resources.Designer.cs b/ContextMenuManager/Properties/Resources.Designer.cs