changed treeView.SelectedNodeChanged to AfterSelect;

some minor fixes in ScrollableControl;

Author: Meragon

Examples/ControlsExtensions.cs

@@ -107,14 +107,13 @@ public static T Create<T>(
                 if (lastChild != null)
                 {
                     var lastChildY = lastChild.Location.Y;
-                    if (lastChildY >= topOffset)
                     {
                         if (placeToRight)
                         {
                             leftOffset = lastChild.Location.X + lastChild.Width + margin;
                             topOffset = lastChildY;
                         }
-                        else
+                        else if (lastChildY >= topOffset)
                             topOffset = lastChildY + lineHeight;
                     }
                 }

Examples/FormExamples.cs

@@ -25,7 +25,6 @@ public FormExamples()
 
             treeView = new TreeView();
             treeView.Anchor = AnchorStyles.Left | AnchorStyles.Top | AnchorStyles.Bottom;
-            treeView.BorderColor = uwfBorderColor;
             treeView.Location = new Point(0, uwfHeaderHeight - 1); // All controls should be placed with Form header offset.
             treeView.Height = Height - uwfHeaderHeight + 1;
             treeView.Width = 220;
@@ -36,7 +35,12 @@ public FormExamples()
             var labelNote = new Label();
             labelNote.Font = new Font("Arial", 14, FontStyle.Bold);
             labelNote.Location = new Point(treeView.Location.X + treeView.Width + 16, treeView.Location.Y);
-            labelNote.Text = "This is not completed overview of UWF controls. \r\nWork in progress.";
+            labelNote.Text = 
+                "This is not completed overview of UWF controls.\r\n" + 
+                "Work in progress.\r\n\r\n" +
+                "Do not forget that you can still modify controls\r\n" + 
+                "with 'SWF Inspector' which is located in drop down\r\n" + 
+                "menu 'Window' -> 'UnityWinForms'.";
 
             Controls.Add(labelNote);
 
@@ -70,6 +74,9 @@ public FormExamples()
             var nodeNumericUpDown = new TreeNode("NumericUpDown");
             nodeNumericUpDown.Tag = typeof(PanelNumericUpDown);
 
+            var nodePanel = new TreeNode("Panel");
+            nodePanel.Tag = typeof(PanelPanel);
+
             var nodePictureBox = new TreeNode("PictureBox");
             nodePictureBox.Tag = typeof(PanelPictureBox);
 
@@ -90,6 +97,7 @@ public FormExamples()
             nodeControls.Nodes.Add(nodeMenuStrip);
             nodeControls.Nodes.Add(nodeMonthCalendar);
             nodeControls.Nodes.Add(nodeNumericUpDown);
+            nodeControls.Nodes.Add(nodePanel);
             nodeControls.Nodes.Add(nodePictureBox);
             nodeControls.Nodes.Add(nodeProgressBar);
             nodeControls.Nodes.Add(nodeScrollBar);
@@ -104,8 +112,7 @@ public FormExamples()
             treeView.Refresh();
 
             // Grip renderer is normal control. Bring it to front if you use it over other controls that can technicaly hide it.
-            // Unfortunately it will not dock with panel scrollbars.
-            uwfSizeGripRenderer.BringToFront();
+            // uwfSizeGripRenderer.BringToFront();
         }
 
         private void TreeViewOnNodeMouseClick(object sender, TreeNodeMouseClickEventArgs e)
@@ -127,14 +134,12 @@ private void TreeViewOnNodeMouseClick(object sender, TreeNodeMouseClickEventArgs
             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;
+            currentPanel.Height = Height - uwfHeaderHeight - 16; // We don't want to hide SizeGripRenderer with scrollbars.
             currentPanel.Width = Width - treeView.Width;
 
             Controls.Add(currentPanel);
 
             currentPanel.Initialize();
-
-            uwfSizeGripRenderer.BringToFront();
         }
     }
 }

Examples/Panels/PanelPanel.cs

@@ -0,0 +1,36 @@
+namespace UnityWinForms.Examples.Panels
+{
+    using System;
+    using System.Linq;
+    using System.Windows.Forms;
+
+    public class PanelPanel : BaseExamplePanel
+    {
+        public override void Initialize()
+        {
+            var panel = this.Create<Panel>();
+            panel.BorderStyle = BorderStyle.Fixed3D;
+
+            for (int i = 0; i < 20; i++)
+            {
+                panel.Create<Label>("label" + i);
+                panel.Create<Button>("button" + i, true, 32);
+            }
+
+            var checkBoxAutoscroll = this.Create<CheckBox>("AutoScroll", false, 8, panel.Height + 8);
+            checkBoxAutoscroll.CheckedChanged += (sender, args) => { panel.AutoScroll = checkBoxAutoscroll.Checked; };
+
+            var borderStyles = Enum.GetNames(typeof(BorderStyle)).Cast<object>().ToArray();
+
+            this.Create<Label>("BorderStyle:", false, 8, lineOffset);
+            var comboBorder = this.Create<ComboBox>();
+            comboBorder.Items.AddRange(borderStyles);
+            comboBorder.SelectedIndex = 2;
+            comboBorder.SelectedIndexChanged += (sender, args) =>
+                {
+                    var selectedItem = comboBorder.SelectedItem.ToString();
+                    panel.BorderStyle = (BorderStyle)Enum.Parse(typeof(BorderStyle), selectedItem);
+                };
+        }
+    }
+}

Examples/Panels/PanelProgressBar.cs

@@ -8,17 +8,31 @@ public class PanelProgressBar : BaseExamplePanel
 
         public override void Initialize()
         {
-            var progressBar = this.Create<ProgressBar>();
-            progressBar.Style = ProgressBarStyle.Marquee;
+            var labelMarqueeText = "Marguee. Value: ";
+            var labelMarquee = this.Create<Label>(labelMarqueeText);
+
+            var progressBarMarquee = this.Create<ProgressBar>();
+            progressBarMarquee.Style = ProgressBarStyle.Marquee;
+
+            var labelBlocksText = "Blocks. Value: ";
+            var labelBlocks = this.Create<Label>(labelBlocksText, false, 8, lineOffset);
+
+            var progressBarBlocks = this.Create<ProgressBar>();
+            progressBarBlocks.Style = ProgressBarStyle.Blocks;
 
             timer = new Timer();
             timer.Interval = 100;
             timer.Tick += (sender, args) =>
             {
-                var nextValue = progressBar.Value + 1;
-                if (nextValue > progressBar.Maximum)
+                var nextValue = progressBarMarquee.Value + 1;
+                if (nextValue > progressBarMarquee.Maximum)
                     nextValue = 0;
-                progressBar.Value = nextValue;
+
+                progressBarMarquee.Value = nextValue;
+                progressBarBlocks.Value = nextValue;
+
+                labelMarquee.Text = labelMarqueeText + progressBarMarquee.Value;
+                labelBlocks.Text = labelBlocksText + progressBarBlocks.Value;
             };
             timer.Start();
         }

System/Windows/Forms/FileDialog.cs

@@ -318,9 +318,8 @@ public FileRenderer(FileDialog owner)
 
                 filesTree = new TreeView();
                 filesTree.Anchor = AnchorStyles.Left | AnchorStyles.Top | AnchorStyles.Right | AnchorStyles.Bottom;
-                filesTree.BorderColor = Color.LightGray;
                 filesTree.Size = new Drawing.Size(Width, Height);
-                filesTree.SelectedNodeChanged += filesTree_SelectedNodeChanged;
+                filesTree.AfterSelect += filesTree_SelectedNodeChanged;
                 filesTree.NodeMouseDoubleClick += filesTree_NodeMouseDoubleClick;
                 Controls.Add(filesTree);
 

System/Windows/Forms/Panel.cs

@@ -16,8 +16,10 @@ protected override Size DefaultSize
             get { return new Size(200, 100); }
         }
 
-        protected override void OnPaint(PaintEventArgs e)
+        protected internal override void uwfOnLatePaint(PaintEventArgs e)
         {
+            base.uwfOnLatePaint(e);
+
             ControlPaint.PrintBorder(e.Graphics, ClientRectangle, BorderStyle, Border3DStyle.Sunken);
         }
     }

System/Windows/Forms/ProgressBar.cs

@@ -7,6 +7,8 @@ public class ProgressBar : Control
     {
         private readonly SolidBrush backBrush = new SolidBrush(SystemColors.ControlLight);
         private readonly SolidBrush barBrush = new SolidBrush(Color.FromArgb(6, 176, 37));
+        private readonly SolidBrush barBrushLight1 = new SolidBrush(Color.FromArgb(83, 200, 105));
+        private readonly SolidBrush barBrushLight2 = new SolidBrush(Color.FromArgb(43, 188, 69));
         private readonly Pen borderPen = new Pen(SystemColors.ActiveBorder);
         private readonly Color defaultProgressForeColor = SystemColors.Highlight;
 
@@ -160,6 +162,8 @@ protected override void OnPaint(PaintEventArgs e)
             g.FillRectangle(backBrush, 0, 0, Width, Height);
             g.DrawRectangle(borderPen, 0, 0, Width, Height);
             g.FillRectangle(barBrush, barX, 1, barWidth, Height - 2);
+            g.FillRectangle(barBrushLight1, barX, Height - 3, barWidth, 3);
+            g.FillRectangle(barBrushLight2, barX, Height - 5, barWidth, 2);
         }
         protected override void OnResize(EventArgs e)
         {
@@ -191,7 +195,7 @@ private void ApplicationOnUpdateEvent()
             }
 
             barX = 0;
-            barWidth = MathHelper.Step(barWidth, (value / maximum) * Width, 200);
+            barWidth = (value / (float)maximum) * Width;
             updatePos = false;
         }
         private void UpdatePos()

System/Windows/Forms/ScrollableControl.cs

@@ -30,7 +30,11 @@ public ScrollableControl()
         public virtual bool AutoScroll
         {
             get { return GetScrollState(ScrollStateAutoScrolling); }
-            set { SetScrollState(ScrollStateAutoScrolling, value); }
+            set
+            {
+                SetScrollState(ScrollStateAutoScrolling, value);
+                PerformLayout();
+            }
         }
         public override Rectangle DisplayRectangle
         {
@@ -113,13 +117,15 @@ internal void Native_EnableScrollBar(bool enable, int orientation)
             {
                 if (oriV && vscroll != null)
                 {
+                    vscroll.Value = 0; // Reset view.
                     vscroll.ValueChanged -= Scroll_ValueChanged;
                     vscroll.Dispose();
                     vscroll = null;
                 }
 
                 if (oriH && hscroll != null)
                 {
+                    hscroll.Value = 0; // Reset view.
                     hscroll.ValueChanged -= Scroll_ValueChanged;
                     hscroll.Dispose();
                     hscroll = null;
@@ -137,6 +143,22 @@ internal ScrollBar GetScrollBar(int orientation)
             return null;
         }
 
+        protected internal override void uwfOnLatePaint(PaintEventArgs e)
+        {
+            if (this is Form)
+                return;
+            if (vscroll == null || hscroll == null)
+                return;
+
+            // Fill rect between two scrollbars.
+            var rx = hscroll.Location.X + hscroll.Width;
+            var ry = vscroll.Location.Y + vscroll.Height;
+            var rw = Width - rx;
+            var rh = Height - ry;
+
+            e.Graphics.uwfFillRectangle(vscroll.BackColor, rx, ry, rw, rh);
+        }
+
         protected bool GetScrollState(int bit)
         {
             return (bit & scrollState) == bit;
@@ -223,9 +245,8 @@ private void UpdateScrolls()
             var autoScroll = (scrollState & ScrollStateAutoScrolling) != 0;
             if (autoScroll == false)
             {
-                HorizontalScroll.UpdateScrollInfo();
-                VerticalScroll.UpdateScrollInfo();
-                UpdateScrollRects();
+                Native_EnableScrollBar(false, NativeMethods.SB_VERT);
+                Native_EnableScrollBar(false, NativeMethods.SB_HORZ);
                 return;
             }
 
@@ -258,7 +279,6 @@ private void UpdateScrolls()
 
             UpdateScrollRects();
         }
-
         private void UpdateScrollRects()
         {
             var hRightOffset = 0;
@@ -279,26 +299,27 @@ private void UpdateScrollRects()
                         gripOriginLocation.Offset(-vscroll.Width, 0);
                     if (hscroll != null && vscroll == null)
                         gripOriginLocation.Offset(0, -hscroll.Height);
-                    if (vscroll != null && hscroll != null)
-                    {
-                        hRightOffset += 14; // img.Width + bottomRight offset
-                        vBottomOffset += 14;
-                    }
-
+                    
                     form.uwfSizeGripRenderer.Location = gripOriginLocation;
                 }
             }
 
+            if (vscroll != null && hscroll != null)
+            {
+                hRightOffset += 14;
+                vBottomOffset += 14;
+            }
+
             if (vscroll != null)
             {
-                vscroll.Location = new Point(Width - vscroll.Width, vTopOffset);
-                vscroll.Height = Height - vTopOffset - vBottomOffset;
+                vscroll.Location = new Point(Width - vscroll.Width - 1, vTopOffset - 1);
+                vscroll.Height = Height - vTopOffset - vBottomOffset - 2;
             }
 
             if (hscroll != null)
             {
-                hscroll.Location = new Point(0, Height - hscroll.Height);
-                hscroll.Width = Width - hRightOffset;
+                hscroll.Location = new Point(1, Height - hscroll.Height - 1);
+                hscroll.Width = Width - hRightOffset - 2;
             }
         }
     }