changed button argument in OnMouseHover, OnMouseMove, OnMouseLeave, OnMouseEnter to the current pressed mouse button;

added treeView.OnItemDrag;
fixed issue when Highcharts interval was 0;

Author: Meragon

Controls/Highcharts/Highchart.cs

@@ -293,13 +293,16 @@ private void DrawSeries(Graphics g, Series s)
             var sdataCount = s.data.Count;
             if (sdataCount == 0) return;
 
-            int categoriesIndex = 0;
-            double prevValue = 0;
+            var categoriesIndex = 0;
+            var prevValue = 0D;
             var areaColor = Color.FromArgb(255 / series.Count, s.color);
-            double valueRange = cachedPlotMax - cachedPlotMin;
+            var valueRange = cachedPlotMax - cachedPlotMin;
 
-            float pointInterval = s.pointInterval;
-            float xStep = cachedCategoriesStep;
+            var pointInterval = s.pointInterval;
+            if (pointInterval <= 0)
+                return;
+            
+            var xStep = cachedCategoriesStep;
             if (sdataCount > 1)
                 xStep = (float)cachedPlotWidth / (sdataCount - 1);
             xStep *= pointInterval;

System/Windows/Forms/Application.cs

@@ -23,6 +23,7 @@ public class Application
         private static DragDropRenderHandler dragRender;
         private static MouseEvents mouseEvent = 0;
         private static MouseButtons mouseButton = 0;
+        private static MouseButtons mouseButtonLastPressed;
         private static Control mouseLastClickControl;
         private static float mouseWheelDelta;
         private static bool mousePositionChanged;
@@ -154,12 +155,24 @@ public void ProccessMouse(MouseEvents mE, float mX, float mY, MouseButtons mButt
 
             mousePositionX = mX;
             mousePositionY = mY;
-            
-            //if (_mouseLastClickControl != null && _mouseEvent == MouseEvents.None && _mouseMovePosition != mousePosition)
-            //    _ProcessControl(mousePosition, _mouseLastClickControl, true);
 
-            if (mE == MouseEvents.None && !mousePositionChanged) 
-                return;
+            switch (mE)
+            {
+                case MouseEvents.None:
+                    if (mousePositionChanged == false)
+                        return;
+                    break;
+                
+                case MouseEvents.Down:
+                    mouseButtonLastPressed = mButton;
+                    break;
+                
+                case MouseEvents.Up:
+                    if (mouseButtonLastPressed == mButton)
+                        mouseButtonLastPressed = MouseButtons.None;
+                    break;
+            }
+
 
             // Dispose context first.
             for (int i = Contexts.Count - 1; i >= 0; i--) // We want to dispose child context first.
@@ -250,10 +263,10 @@ public void Run(Control control)
         public void Update()
         {
             // Update hovered control.
-            if (hoveredControl != null && dragndrop == false)
+            if (hoveredControl != null/* && dragndrop == false*/)
             {
                 var mclient = hoveredControl.PointToClient(Control.MousePosition);
-                var hargs = new MouseEventArgs(MouseButtons.None, 0, mclient.X, mclient.Y, 0);
+                var hargs = new MouseEventArgs(mouseButtonLastPressed, 0, mclient.X, mclient.Y, 0);
                 hoveredControl.RaiseOnMouseHover(hargs);
                 if (updateHoveredControl)
                     hoveredControl.RaiseOnMouseMove(hargs);
@@ -266,7 +279,7 @@ public void Update()
                 {
                     hoveredControl.hovered = false;
                     hoveredControl.mouseEntered = false;
-                    hoveredControl.RaiseOnMouseLeave(new MouseEventArgs(MouseButtons.None, 0, 0, 0, 0));
+                    hoveredControl.RaiseOnMouseLeave(new MouseEventArgs(mouseButtonLastPressed, 0, 0, 0, 0));
                     if (dragndrop)
                         hoveredControl.RaiseOnDragLeave(EventArgs.Empty);
                 }
@@ -281,7 +294,7 @@ public void Update()
 
                         controlAtMouse.hovered = true;
                         controlAtMouse.mouseEntered = true;
-                        controlAtMouse.RaiseOnMouseEnter(new MouseEventArgs(MouseButtons.None, 0, mclient.X, mclient.Y, 0));
+                        controlAtMouse.RaiseOnMouseEnter(new MouseEventArgs(mouseButtonLastPressed, 0, mclient.X, mclient.Y, 0));
                         if (dragndrop)
                             controlAtMouse.RaiseOnDragEnter(new DragEventArgs(new DataObject(dragData), 0, mclient.X, mclient.Y, DragDropEffects.None, dragControlEffects));
                     }

System/Windows/Forms/TreeView.cs

@@ -199,6 +199,12 @@ protected virtual void OnDrawNode(DrawTreeNodeEventArgs e)
         {
             if (onDrawNode != null) onDrawNode(this, e);
         }
+        protected virtual void OnItemDrag(ItemDragEventArgs e)
+        {
+            var handler = ItemDrag;
+            if (handler != null)
+                handler(this, e);
+        }
         protected override void OnKeyDown(KeyEventArgs e)
         {
             base.OnKeyDown(e);
@@ -338,17 +344,15 @@ protected override void OnMouseHover(EventArgs e)
         }
         protected override void OnMouseMove(MouseEventArgs e)
         {
-            if (drag)
-            {
-                if (dragPosition.Distance(e.Location) > 4)
-                {
-                    var itemDrag = ItemDrag;
-                    if (itemDrag != null)
-                        itemDrag(this, new ItemDragEventArgs(e.Button, dragNode));
-                    dragPosition = Point.Empty;
-                    drag = false;
-                }
-            }
+            base.OnMouseMove(e);
+
+            if (drag == false) return;
+            if (dragPosition.Distance(e.Location) < 4) return;
+            
+            OnItemDrag(new ItemDragEventArgs(e.Button, dragNode));
+                    
+            dragPosition = Point.Empty;
+            drag = false;
         }
         protected override void OnMouseWheel(MouseEventArgs e)
         {

Unity/API/UnityGdi.cs

@@ -391,7 +391,9 @@ public SizeF MeasureString(string text, Font font)
             var labelSkin = UE.GUI.skin.label;
             int guiSkinFontSizeBuffer = GUI_SetFont(labelSkin, font);
 
-            var size = labelSkin.CalcSize(new UE.GUIContent(text));
+            textContent.text = text;
+            
+            var size = labelSkin.CalcSize(textContent);
 
             labelSkin.fontSize = guiSkinFontSizeBuffer;