minor optimization changes for UnityGdi.DrawString;

Author: Meragon

System/Windows/Forms/Control.cs

@@ -18,7 +18,6 @@ public class Control : Component, IDropTarget
 
         internal Application uwfAppOwner;
         internal bool uwfAutoGroup;
-        internal int uwfBatches;
         internal bool uwfShadowBox;
         internal DrawHandler uwfShadowHandler;
         internal Point uwfOffset;
@@ -554,8 +553,6 @@ internal virtual void RaiseOnKeyUp(KeyEventArgs e)
         }
         internal virtual void RaiseOnPaint(PaintEventArgs e)
         {
-            uwfBatches = 0;
-
             if (uwfShadowBox)
             {
                 if (uwfShadowHandler == null)

System/Windows/Forms/Form.cs

@@ -8,6 +8,7 @@ public class Form : ContainerControl, IResizableControl
         internal readonly Pen borderPen = new Pen(defaultFormBorderColor);
         internal readonly Pen innerBorderPen = new Pen(defaultFormInnerBorderColor);
         internal bool dialog;
+        internal bool formMoving;
         internal Color uwfHeaderColor = defaultFormHeaderColor;
         internal Font uwfHeaderFont;
         internal int uwfHeaderHeight = 24;
@@ -33,7 +34,6 @@ public class Form : ContainerControl, IResizableControl
         private Button closeButton;
         private Action<Form, DialogResult> dialogCallback;
         private MenuStrip mainMenuStrip;
-        private bool windowMove;
         private Point windowMove_StartPosition;
         private Form owner;
         private ControlResizeTypes resizeType;
@@ -333,7 +333,7 @@ internal virtual void Application_UpdateEvent()
         }
         internal virtual void Application_UpClick(object sender, MouseEventArgs e)
         {
-            windowMove = false;
+            formMoving = false;
             resizeType = ControlResizeTypes.None;
             if (Application.activeResizeControl == this)
                 Application.activeResizeControl = null;
@@ -418,15 +418,15 @@ protected override void OnMouseDown(MouseEventArgs e)
                         if (e.Location.Y < uwfHeaderHeight)
                         {
                             windowMove_StartPosition = e.Location;
-                            windowMove = true;
+                            formMoving = true;
                         }
                 }
             }
         }
         protected override void OnMouseMove(MouseEventArgs e)
         {
             base.OnMouseMove(e);
-            if (windowMove)
+            if (formMoving)
             {
                 if (Parent == null)
                     Location = PointToScreen(e.Location).Subtract(windowMove_StartPosition);

System/Windows/Forms/TabControl.cs

@@ -157,7 +157,7 @@ public void SelectTab(int index)
             var cancelArgs = new TabControlCancelEventArgs(selectedPage, index, false, TabControlAction.Selecting);
 
             OnSelecting(cancelArgs);
-            
+
             if (cancelArgs.Cancel)
                 return;
 
@@ -731,6 +731,7 @@ internal class TabPageButton : Button
             internal Color disabledBackHoverColor = Color.FromArgb(223, 238, 252);
             internal Padding textPadding = new Padding(6, 0, 6, 0);
 
+            private readonly Pen borderPen = new Pen(Color.Gray);
             private readonly TabControl owner;
             private readonly int index;
             private bool hidden;
@@ -794,7 +795,7 @@ protected override void OnPaint(PaintEventArgs e)
                 var h = Height;
 
                 // Draw borders.
-                var borderPen = new Pen(owner.uwfBorderColor);
+                borderPen.Color = owner.uwfBorderColor;
                 g.DrawLine(borderPen, 0, 0, w, 0); // Top.
                 g.DrawLine(borderPen, 0, 0, 0, h - 1); // Left.
                 g.DrawLine(borderPen, w - 1, 0, w - 1, h - 1); // Right.

Unity/API/UnityGdi.cs

@@ -12,11 +12,13 @@ public class UnityGdi : IApiGraphics
         public static UE.Texture2D defaultTexture = UnityWinForms.DefaultSprite;
         public static bool GL_LINES;
 
+        private static readonly UE.GUIContent textContent = new UE.GUIContent(""); // GUIContent.Temp(text) replacement.
+
         private readonly PointF defaultPivot = PointF.Empty;
 
         public void BeginGroup(float x, float y, float width, float height)
         {
-            UE.GUI.BeginGroup(new UE.Rect(x, y, width, height));
+            UE.GUI.BeginGroup(new UE.Rect(x, y, width, height), UE.GUIContent.none, UE.GUIStyle.none);
         }
         public void Clear(Color color)
         {
@@ -301,7 +303,11 @@ public void DrawString(string text, Font font, Color color, float x, float y, fl
 
             UE.GUI.color = color.ToUnityColor();
             labelSkin.alignment = uAlign;
-            UE.GUI.Label(new UE.Rect(x, y, width, height), text);
+
+            textContent.text = text;
+            
+            // It's faster to invoke less methods and use your own GUIContent. Not that much, but anyway.
+            UE.GUI.Label(new UE.Rect(x, y, width, height), textContent, labelSkin);
 
             labelSkin.fontSize = guiSkinFontSizeBuffer;
         }