* 重构字体

SunnyUI/Common/UMessageTip.cs

@@ -48,6 +48,7 @@ namespace Sunny.UI
     {
         //默认字体。当样式中的Font==null时用该字体替换
         static readonly Font DefaultFont = UIStyles.Font();
+
         //文本格式。用于测量和绘制
         static readonly StringFormat DefStringFormat = StringFormat.GenericTypographic;
 
@@ -178,6 +179,7 @@ namespace Sunny.UI
             {
                 throw new ArgumentNullException(nameof(controlOrItem));
             }
+
             Show(text, style, delay, floating, GetCenterPosition(controlOrItem), centerInControl ?? IsContainerLike(controlOrItem));
         }
 

SunnyUI/Controls/DropItem/UIDropControl.Designer.cs

@@ -19,6 +19,7 @@
                 components.Dispose();
             }
 
+            edit?.Dispose();
             ItemForm?.Dispose();
             base.Dispose(disposing);
         }

SunnyUI/Controls/DropItem/UIDropControl.cs

@@ -45,7 +45,7 @@ namespace Sunny.UI
             Padding = new Padding(0, 0, 30, 2);
 
             edit.AutoSize = false;
-            edit.Font = UIStyles.Font();
+            //edit.Font = UIStyles.Font();
             edit.Left = 4;
             edit.Top = 3;
             edit.Text = String.Empty;

SunnyUI/Controls/UIDataGridViewFooter.cs

@@ -39,8 +39,7 @@ namespace Sunny.UI
             SetStyleFlags(true, false, true);
             Height = 29;
             RadiusSides = UICornerRadiusSides.None;
-
+            //Font = UIStyles.Font();
-            Font = UIStyles.Font();
             foreColor = UIStyles.Blue.DataGridViewFooterForeColor;
             fillColor = UIStyles.Blue.PlainColor;
             rectColor = UIStyles.Blue.RectColor;

SunnyUI/Controls/UILabel.cs

@@ -181,7 +181,7 @@ namespace Sunny.UI
     {
         public UILinkLabel()
         {
-            Font = UIStyles.Font();
+            base.Font = UIStyles.Font();
             LinkBehavior = LinkBehavior.AlwaysUnderline;
             Version = UIGlobal.Version;
 

SunnyUI/Controls/UIListBoxEx.cs

@@ -191,7 +191,7 @@ namespace Sunny.UI
             //
             BorderStyle = BorderStyle.FixedSingle;
             DrawMode = DrawMode.OwnerDrawFixed;
-            Font = UIStyles.Font();
+            base.Font = UIStyles.Font();
             IntegralHeight = false;
             ItemHeight = 25;
             Size = new Size(150, 200);

SunnyUI/Controls/UINavBar.cs

@@ -56,7 +56,7 @@ namespace Sunny.UI
 
             DoubleBuffered = true;
             UpdateStyles();
-            Font = UIStyles.Font();
+            base.Font = UIStyles.Font();
 
             NavBarMenu.VisibleChanged += NavBarMenu_VisibleChanged;
             Dock = DockStyle.Top;

SunnyUI/Controls/UINavMenu.cs

@@ -72,7 +72,7 @@ namespace Sunny.UI
             //ShowRootLines = false;
 
             DoubleBuffered = true;
-            Font = UIStyles.Font();
+            base.Font = UIStyles.Font();
             //CheckBoxes = false;
             ItemHeight = 50;
             BackColor = Color.FromArgb(56, 56, 56);

SunnyUI/Controls/UIRichTextBox.cs

@@ -84,6 +84,12 @@ namespace Sunny.UI
             edit.MouseMove += Edit_MouseMove;
         }
 
+        ~UIRichTextBox()
+        {
+            edit?.Dispose();
+            bar?.Dispose();
+        }
+
         public new event EventHandler Leave;
         public new event EventHandler Validated;
         public new event CancelEventHandler Validating;

SunnyUI/Controls/UITabControl.cs

@@ -61,7 +61,7 @@ namespace Sunny.UI
 
             ItemSize = new Size(150, 40);
             DrawMode = TabDrawMode.OwnerDrawFixed;
-            Font = UIStyles.Font();
+            base.Font = UIStyles.Font();
             AfterSetFillColor(FillColor);
             Version = UIGlobal.Version;
 

SunnyUI/Controls/UITabControlMenu.cs

@@ -42,7 +42,7 @@ namespace Sunny.UI
 
             base.ItemSize = new Size(40, 200);
             DrawMode = TabDrawMode.OwnerDrawFixed;
-            Font = UIStyles.Font();
+            base.Font = UIStyles.Font();
             AfterSetFillColor(FillColor);
             Size = new Size(450, 270);
             Version = UIGlobal.Version;

SunnyUI/Controls/UITextBox.Designer.cs

@@ -18,6 +18,10 @@
                 CloseTips();
                 components.Dispose();
             }
+
+            edit?.Dispose();
+            bar?.Dispose();
+            btn?.Dispose();
             base.Dispose(disposing);
         }
 

SunnyUI/Controls/UITextBox.cs

@@ -72,7 +72,6 @@ namespace Sunny.UI
             SetStyleFlags(true, true, true);
 
             ShowText = false;
-            Font = UIStyles.Font();
             MinimumSize = new Size(1, 16);
 
             Width = 150;

SunnyUI/Controls/UITreeView.cs

@@ -94,6 +94,13 @@ namespace Sunny.UI
             view.MouseClick += View_MouseClick;
         }
 
+        ~UITreeView()
+        {
+            view?.Dispose();
+            Bar?.Dispose();
+            HBar?.Dispose();
+        }
+
         public event NodeLabelEditEventHandler AfterLabelEdit;
         public new event EventHandler MouseLeave;
         public new event EventHandler MouseEnter;