added Layout event to Control;

moved more Unity dependencies away from SWF;

Author: Meragon

Core/API/IApiInput.cs

@@ -0,0 +1,7 @@
+namespace System.Drawing.API
+{
+    public interface IApiInput
+    {
+        bool CursorVisible { get; set; }
+    }
+}

Utility/ApiHolder.cs renamed to Core/ApiHolder.cs

@@ -3,15 +3,14 @@
     using System.Drawing;
     using System.Drawing.API;
 
-    using Unity.API;
-
     /// <summary>
     /// Replace with your own implementation if needed.
     /// </summary>
     public static class ApiHolder
     {
-        public static IApiGraphics Graphics = new UnityGdi();
-        public static IApiSystem System = new UnitySystem();
-        public static IApiTiming Timing = new UnityTiming();
+        public static IApiGraphics Graphics;
+        public static IApiInput Input;
+        public static IApiSystem System;
+        public static IApiTiming Timing;
     }
 }

Examples/FormExamples.cs

@@ -82,6 +82,22 @@ public FormExamples()
             // uwfSizeGripRenderer.BringToFront();
         }
 
+        public void SetPanel(BaseExamplePanel panel)
+        {
+            if (currentPanel != null && currentPanel.IsDisposed == false)
+                currentPanel.Dispose();
+
+            currentPanel = panel;
+            currentPanel.Anchor = AnchorStyles.Left | AnchorStyles.Top | AnchorStyles.Right | AnchorStyles.Bottom;
+            currentPanel.Location = new Point(treeView.Location.X + treeView.Width, uwfHeaderHeight);
+            currentPanel.Height = Height - uwfHeaderHeight - 16; // We don't want to hide SizeGripRenderer with scrollbars.
+            currentPanel.Width = Width - treeView.Width;
+
+            Controls.Add(currentPanel);
+
+            currentPanel.Initialize();
+        }
+        
         private static void AddNode(TreeNode parent, string text, object tag)
         {
             var node = new TreeNode(text);
@@ -102,18 +118,7 @@ private void TreeViewOnNodeMouseClick(object sender, TreeNodeMouseClickEventArgs
             if (panel == null)
                 return;
 
-            if (currentPanel != null && currentPanel.IsDisposed == false)
-                currentPanel.Dispose();
-
-            currentPanel = panel;
-            currentPanel.Anchor = AnchorStyles.Left | AnchorStyles.Top | AnchorStyles.Right | AnchorStyles.Bottom;
-            currentPanel.Location = new Point(treeView.Location.X + treeView.Width, uwfHeaderHeight);
-            currentPanel.Height = Height - uwfHeaderHeight - 16; // We don't want to hide SizeGripRenderer with scrollbars.
-            currentPanel.Width = Width - treeView.Width;
-
-            Controls.Add(currentPanel);
-
-            currentPanel.Initialize();
+            SetPanel(panel);
         }
     }
 }

System/Windows/Forms/Application.cs

@@ -37,9 +37,7 @@ public class Application
         private readonly PaintEventArgs paintEventArgs;
         private float mousePositionX;
         private float mousePositionY;
-        private MouseEvents userMouseEvent;
-        private MouseEventArgs userMouseArgs;
-
+        
         public Application()
         {
             TabSwitching = true;
@@ -157,107 +155,30 @@ public void ProccessKeys(KeyEventArgs args, KeyEvents keyEventType)
             if (keyEventType == KeyEvents.Down)
                 currentKeyDown = args.KeyCode;
         }
-        public void ProccessMouse(float mouseX, float mouseY)
+        public void ProccessMouse(MouseEvents mE, float mX, float mY, MouseButtons mButton, int clicks, int delta)
         {
             if (scaleX != 1f || scaleY != 1f)
             {
-                mouseX /= scaleX;
-                mouseY /= scaleY;
+                mX /= scaleX;
+                mY /= scaleY;
             }
 
-            mouseEvent = MouseEvents.None;
-            mouseButton = MouseButtons.None;
+            mouseEvent = mE;
+            mouseButton = mButton;
+            mouseWheelDelta = delta;
 
-            mousePositionChanged = mousePositionX != mouseX || mousePositionY != mouseY;
+            mousePositionChanged = mousePositionX != mX || mousePositionY != mY;
             if (mousePositionChanged)
                 updateHoveredControl = true;
 
-            mousePositionX = mouseX;
-            mousePositionY = mouseY;
-
-            #region Set events.
-
-            int eventButton = -1;
-            int eventClicks = 0;
-            float eventDelta = 0;
-            EventType eventType = EventType.Ignore;
-
-            if (userMouseArgs != null)
-            {
-                switch (userMouseArgs.Button)
-                {
-                    case MouseButtons.Left: eventButton = 0; break;
-                    case MouseButtons.Right: eventButton = 1; break;
-                    case MouseButtons.Middle: eventButton = 2; break;
-                }
-                eventClicks = userMouseArgs.Clicks;
-                eventDelta = userMouseArgs.Delta;
-                switch (userMouseEvent)
-                {
-                    case MouseEvents.Down: eventType = EventType.MouseDown; break;
-                    case MouseEvents.Up: eventType = EventType.MouseUp; break;
-                    case MouseEvents.Wheel: eventType = EventType.ScrollWheel; break;
-                }
-                userMouseArgs = null;
-            }
-            else
-            {
-                eventButton = Event.current.button;
-                eventClicks = Event.current.clickCount;
-                eventDelta = Event.current.delta.y;
-                eventType = Event.current.type;
-            }
-
-            switch (eventType)
-            {
-                case EventType.MouseDown:
-                    switch (eventButton)
-                    {
-                        case 0:
-                            mouseButton = MouseButtons.Left;
-                            mouseEvent = MouseEvents.Down;
-                            if (eventClicks > 1)
-                                mouseEvent = MouseEvents.DoubleClick;
-                            break;
-                        case 1:
-                            mouseButton = MouseButtons.Right;
-                            mouseEvent = MouseEvents.Down;
-                            break;
-                        case 2:
-                            mouseButton = MouseButtons.Middle;
-                            mouseEvent = MouseEvents.Down;
-                            break;
-                    }
-                    break;
-                case EventType.MouseUp:
-                    switch (eventButton)
-                    {
-                        case 0:
-                            mouseButton = MouseButtons.Left;
-                            mouseEvent = MouseEvents.Up;
-                            break;
-                        case 1:
-                            mouseButton = MouseButtons.Right;
-                            mouseEvent = MouseEvents.Up;
-                            break;
-                        case 2:
-                            mouseButton = MouseButtons.Middle;
-                            mouseEvent = MouseEvents.Up;
-                            break;
-                    }
-                    break;
-                case EventType.ScrollWheel:
-                    mouseEvent = MouseEvents.Wheel;
-                    mouseWheelDelta = eventDelta;
-                    break;
-            }
-
-            #endregion
-
+            mousePositionX = mX;
+            mousePositionY = mY;
+            
             //if (_mouseLastClickControl != null && _mouseEvent == MouseEvents.None && _mouseMovePosition != mousePosition)
             //    _ProcessControl(mousePosition, _mouseLastClickControl, true);
 
-            if (mouseEvent == MouseEvents.None && !mousePositionChanged) return;
+            if (mE == MouseEvents.None && !mousePositionChanged) 
+                return;
 
             // Dispose context first.
             for (int i = Contexts.Count - 1; i >= 0; i--) // We want to dispose child context first.
@@ -266,53 +187,43 @@ public void ProccessMouse(float mouseX, float mouseY)
                 if (!contextControl.uwfContext) continue;
 
                 if (Contains(contextControl, hoveredControl)) continue;
-                if (mouseEvent != MouseEvents.Down) continue;
+                if (mE != MouseEvents.Down) continue;
 
                 contextControl.Dispose();
             }
 
-            if (hoveredControl == null && mouseEvent == MouseEvents.Up)
+            if (hoveredControl == null && mE == MouseEvents.Up)
             {
                 dragndrop = false;
                 dragData = null;
                 dragRender = null;
             }
 
             if (hoveredControl != null)
-                _ProcessControl(new PointF(mouseX, mouseY), hoveredControl, false);
+                _ProcessControl(new PointF(mX, mY), hoveredControl, false);
 
-            if (mouseEvent == MouseEvents.Down)
+            if (mE == MouseEvents.Down)
             {
-                var downArgs = new MouseEventArgs(mouseButton, 1, (int)mouseX, (int)mouseY, 0);
+                var downArgs = new MouseEventArgs(mouseButton, clicks, (int) mX, (int) mY, delta);
                 MouseHook.RaiseMouseDown(hoveredControl, downArgs);
             }
 
-            if (mouseEvent == MouseEvents.Up)
+            if (mE == MouseEvents.Up)
             {
-                var upArgs = new MouseEventArgs(mouseButton, 1, (int)mouseX, (int)mouseY, 0);
+                var upArgs = new MouseEventArgs(mouseButton, clicks, (int) mX, (int) mY, delta);
                 MouseHook.RaiseMouseUp(hoveredControl, upArgs);
             }
         }
-        public void ProccessMouse(PointF mousePosition)
-        {
-            ProccessMouse(mousePosition.X, mousePosition.Y);
-        }
         public void RaiseMouseEvent(MouseEvents mEv, MouseEventArgs mArgs)
         {
-            userMouseEvent = mEv;
-            userMouseArgs = mArgs;
-
-            ProccessMouse(new Drawing.PointF(mArgs.X, mArgs.Y));
+            if (mArgs != null)
+                ProccessMouse(mEv, mArgs.X, mArgs.Y, mArgs.Button, mArgs.Clicks, mArgs.Delta);
         }
         /// <summary>
         /// Redrawing the whole screen.
         /// </summary>
         public void Redraw()
         {
-            // Scale if needed.
-            if (scaleX != 1f || scaleY != 1f)
-                UnityEngine.GUI.matrix = UnityEngine.Matrix4x4.TRS(Vector3.zero, Quaternion.AngleAxis(0, Vector3.up), new Vector3(scaleX, scaleY, 1));
-
             paintEventArgs.Graphics.Clear(System.Drawing.Color.White);
 
             for (int i = 0; i < Forms.Count; i++)

System/Windows/Forms/Control.cs

@@ -84,6 +84,7 @@ public Control()
         public event KeyEventHandler KeyDown;
         public event KeyPressEventHandler KeyPress;
         public event KeyEventHandler KeyUp;
+        public event LayoutEventHandler Layout;
         public event EventHandler LocationChanged;
         public event EventHandler LostFocus;
         public event MouseEventHandler MouseClick;
@@ -350,7 +351,7 @@ public virtual void Invalidate(Rectangle rc, bool invalidateChildren)
         }
         public void PerformLayout()
         {
-            PerformLayout(null);
+            OnLayout(null);
         }
         public Point PointToClient(Point p)
         {
@@ -492,9 +493,9 @@ internal void PaintBackground(PaintEventArgs e, Rectangle rectangle, Color backC
             else if (backColor.A > 0) // Fill back.
                 PaintBackColor(e, rectangle, backColor);
         }
-        internal void PerformLayout(object args)
+        internal void PerformLayout(Control affectedControl, string affectedProperty)
         {
-            OnLayout(args);
+            OnLayout(new LayoutEventArgs(affectedControl, affectedProperty));
         }
         internal virtual void RaiseOnDragDrop(DragEventArgs drgevent)
         {
@@ -767,8 +768,11 @@ protected virtual void OnKeyUp(KeyEventArgs e)
             if (keyUp != null)
                 keyUp(this, e);
         }
-        protected virtual void OnLayout(object levent)
+        protected virtual void OnLayout(LayoutEventArgs e)
         {
+            var handler = Layout;
+            if (handler != null)
+                handler(this, e);
         }
         protected virtual void OnLocationChanged(EventArgs e)
         {

System/Windows/Forms/Cursor.cs

@@ -35,7 +35,7 @@ public static Cursor Current
                 if (current == null)
                     current = Cursors.Default;
 
-                UnityEngine.Cursor.visible = IsVisible;
+                ApiHolder.Input.CursorVisible = IsVisible;
             }
         }
         public static Point Position
@@ -55,7 +55,7 @@ internal static Cursor CurrentSystem
 
                 currentSystem = value;
 
-                UnityEngine.Cursor.visible = IsVisible;
+                ApiHolder.Input.CursorVisible = IsVisible;
             }
         }
         internal static bool IsVisible

System/Windows/Forms/Cursors.cs

@@ -4,7 +4,7 @@
 
     public static class Cursors
     {
-        private static AppGdiImages.CursorImages images = Unity.API.UnityWinForms.GdiImages.Cursors;
+        internal static AppGdiImages.CursorImages images;
 
         private static Cursor defaultCursor;
         private static Cursor sizeAll;

System/Windows/Forms/LayoutEventArgs.cs

@@ -0,0 +1,41 @@
+namespace System.Windows.Forms
+{
+    using System.ComponentModel;
+
+    public class LayoutEventArgs : EventArgs
+    {
+        private readonly IComponent affectedComponent;
+        private readonly string     affectedProperty;
+
+        public LayoutEventArgs(IComponent affectedComponent, string affectedProperty)
+        {
+            this.affectedComponent = affectedComponent;
+            this.affectedProperty = affectedProperty;
+        }
+        public LayoutEventArgs(Control affectedControl, string affectedProperty) : this((IComponent)affectedControl, affectedProperty)
+        {
+        }
+
+        public IComponent AffectedComponent
+        {
+            get
+            {
+                return this.affectedComponent;
+            }
+        }
+        public Control AffectedControl
+        {
+            get
+            {
+                return this.affectedComponent as Control;
+            }
+        }
+        public string AffectedProperty
+        {
+            get
+            {
+                return this.affectedProperty;
+            }
+        }
+    }
+}

System/Windows/Forms/LayoutEventHandler.cs

@@ -0,0 +1,4 @@
+namespace System.Windows.Forms
+{
+    public delegate void LayoutEventHandler(object sender, LayoutEventArgs e);
+}

System/Windows/Forms/ScrollableControl.cs

@@ -163,9 +163,9 @@ protected bool GetScrollState(int bit)
         {
             return (bit & scrollState) == bit;
         }
-        protected override void OnLayout(object levent)
+        protected override void OnLayout(LayoutEventArgs e)
         {
-            base.OnLayout(levent);
+            base.OnLayout(e);
 
             UpdateScrolls();
         }