From baaab81736117491d4acae090890d34041e3e426 Mon Sep 17 00:00:00 2001 From: Robin Date: Mon, 30 Nov 2015 19:19:23 +0000 Subject: [PATCH] Minor refactoring and cleaning Removed unnecessary comments. Added string interpolation from C# 6.0. Removed unneeded library references. --- DarkUI/Collections/ObservableList.cs | 8 -------- DarkUI/Controls/DarkButton.cs | 1 + DarkUI/Controls/DarkListView.cs | 7 +++---- DarkUI/Controls/DarkScrollBar.cs | 7 +++---- DarkUI/Controls/DarkTreeView.cs | 15 +++------------ DarkUI/Controls/Items/DarkListItem.cs | 3 +++ DarkUI/Controls/Items/DarkTreeNode.cs | 4 ++++ DarkUI/Extensions/IEnumerableExtensions.cs | 6 ++---- DarkUI/Win32/DarkControlScrollFilter.cs | 3 +-- Example/Forms/Dialogs/DialogAbout.cs | 2 +- Example/Forms/Dialogs/DialogTest.cs | 6 +++--- Example/Forms/Docking/DockConsole.cs | 2 +- Example/Forms/Docking/DockHistory.cs | 2 +- Example/Forms/Docking/DockLayers.cs | 2 +- Example/Forms/Docking/DockProject.cs | 4 ++-- Example/Forms/MainForm.cs | 2 +- Example/Program.cs | 3 --- 17 files changed, 30 insertions(+), 47 deletions(-) diff --git a/DarkUI/Collections/ObservableList.cs b/DarkUI/Collections/ObservableList.cs index 6d6f307..24c5fc9 100644 --- a/DarkUI/Collections/ObservableList.cs +++ b/DarkUI/Collections/ObservableList.cs @@ -40,20 +40,12 @@ namespace DarkUI { if (!_disposed) { - if (disposing) - { - // Release managed resources - } - - // Release unmanaged resources. - // Set large fields to null. if (ItemsAdded != null) ItemsAdded = null; if (ItemsRemoved != null) ItemsRemoved = null; - // Set disposed flag _disposed = true; } } diff --git a/DarkUI/Controls/DarkButton.cs b/DarkUI/Controls/DarkButton.cs index a5acb9e..b82d019 100644 --- a/DarkUI/Controls/DarkButton.cs +++ b/DarkUI/Controls/DarkButton.cs @@ -33,6 +33,7 @@ namespace DarkUI Invalidate(); } } + public new bool Enabled { get { return base.Enabled; } diff --git a/DarkUI/Controls/DarkListView.cs b/DarkUI/Controls/DarkListView.cs index 326149f..5815345 100644 --- a/DarkUI/Controls/DarkListView.cs +++ b/DarkUI/Controls/DarkListView.cs @@ -208,7 +208,7 @@ namespace DarkUI public void SelectItem(int index) { if (index < 0 || index > Items.Count - 1) - throw new IndexOutOfRangeException(string.Format("Value '{0}' is outside of valid range.", index)); + throw new IndexOutOfRangeException($"Value '{index}' is outside of valid range."); _selectedIndices.Clear(); _selectedIndices.Add(index); @@ -228,7 +228,7 @@ namespace DarkUI foreach (var index in list) { if (index < 0 || index > Items.Count - 1) - throw new IndexOutOfRangeException(string.Format("Value '{0}' is outside of valid range.", index)); + throw new IndexOutOfRangeException($"Value '{index}' is outside of valid range."); _selectedIndices.Add(index); } @@ -428,7 +428,6 @@ namespace DarkUI var top = range.Min(); var bottom = range.Max(); - // Draw items for (var i = top; i <= bottom; i++) { var width = Math.Max(ContentSize.Width, Viewport.Width); @@ -446,7 +445,7 @@ namespace DarkUI g.FillRectangle(b, rect); } - // Border + // DEBUG: Border /*using (var p = new Pen(Colors.DarkBorder)) { g.DrawLine(p, new Point(rect.Left, rect.Bottom - 1), new Point(rect.Right, rect.Bottom - 1)); diff --git a/DarkUI/Controls/DarkScrollBar.cs b/DarkUI/Controls/DarkScrollBar.cs index 878f69c..35d8c5f 100644 --- a/DarkUI/Controls/DarkScrollBar.cs +++ b/DarkUI/Controls/DarkScrollBar.cs @@ -205,7 +205,7 @@ namespace DarkUI if (_trackArea.Contains(e.Location) && e.Button == MouseButtons.Left) { - // Check if our input is at least aligned with the thumb + // Step 1. Check if our input is at least aligned with the thumb if (_scrollOrientation == DarkOrientation.Vertical) { var modRect = new Rectangle(_thumbArea.Left, _trackArea.Top, _thumbArea.Width, _trackArea.Height); @@ -219,7 +219,7 @@ namespace DarkUI return; } - // Step 1. Scroll to the area initially clicked. + // Step 2. Scroll to the area initially clicked. if (_scrollOrientation == DarkOrientation.Vertical) { var loc = e.Location.Y; @@ -235,7 +235,7 @@ namespace DarkUI ScrollToPhysical(loc); } - // Step 2. Initiate a thumb drag. + // Step 3. Initiate a thumb drag. _isScrolling = true; _initialContact = e.Location; _thumbHot = true; @@ -246,7 +246,6 @@ namespace DarkUI _initialValue = _thumbArea.Left; Invalidate(); - return; } } diff --git a/DarkUI/Controls/DarkTreeView.cs b/DarkUI/Controls/DarkTreeView.cs index bcd104e..b3070b4 100644 --- a/DarkUI/Controls/DarkTreeView.cs +++ b/DarkUI/Controls/DarkTreeView.cs @@ -163,13 +163,6 @@ namespace DarkUI { if (!_disposed) { - if (disposing) - { - // Release managed resources - } - - // Release unmanaged resources. - // Set large fields to null. DisposeIcons(); if (SelectedNodesChanged != null) @@ -187,11 +180,9 @@ namespace DarkUI if (_selectedNodes != null) _selectedNodes.CollectionChanged -= SelectedNodes_CollectionChanged; - // Set disposed flag _disposed = true; } - // Call Dispose on your base class. base.Dispose(disposing); } @@ -1159,7 +1150,7 @@ namespace DarkUI if (node == dropNode) { if (isMoving) - DarkMessageBox.ShowError(String.Format(@"Cannot move {0}. The destination folder is the same as the source folder.", node.Text), Application.ProductName); + DarkMessageBox.ShowError($"Cannot move {node.Text}. The destination folder is the same as the source folder.", Application.ProductName); return false; } @@ -1167,7 +1158,7 @@ namespace DarkUI if (node.ParentNode != null && node.ParentNode == dropNode) { if (isMoving) - DarkMessageBox.ShowError(String.Format(@"Cannot move {0}. The destination folder is the same as the source folder.", node.Text), Application.ProductName); + DarkMessageBox.ShowError($"Cannot move {node.Text}. The destination folder is the same as the source folder.", Application.ProductName); return false; } @@ -1178,7 +1169,7 @@ namespace DarkUI if (node == parentNode) { if (isMoving) - DarkMessageBox.ShowError(String.Format(@"Cannot move {0}. The destination folder is a subfolder of the source folder.", node.Text), Application.ProductName); + DarkMessageBox.ShowError($"Cannot move {node.Text}. The destination folder is a subfolder of the source folder.", Application.ProductName); return false; } diff --git a/DarkUI/Controls/Items/DarkListItem.cs b/DarkUI/Controls/Items/DarkListItem.cs index 6b320c6..27712f9 100644 --- a/DarkUI/Controls/Items/DarkListItem.cs +++ b/DarkUI/Controls/Items/DarkListItem.cs @@ -7,8 +7,11 @@ namespace DarkUI #region Property Region public string Text { get; set; } + public Rectangle Area { get; set; } + public Color TextColor { get; set; } + public FontStyle FontStyle { get; set; } #endregion diff --git a/DarkUI/Controls/Items/DarkTreeNode.cs b/DarkUI/Controls/Items/DarkTreeNode.cs index ae1b931..93c2cce 100644 --- a/DarkUI/Controls/Items/DarkTreeNode.cs +++ b/DarkUI/Controls/Items/DarkTreeNode.cs @@ -46,13 +46,17 @@ namespace DarkUI } public Rectangle ExpandArea { get; set; } + public Rectangle IconArea { get; set; } + public Rectangle TextArea { get; set; } + public Rectangle FullArea { get; set; } public bool ExpandAreaHot { get; set; } public Bitmap Icon { get; set; } + public Bitmap ExpandedIcon { get; set; } public bool Expanded diff --git a/DarkUI/Extensions/IEnumerableExtensions.cs b/DarkUI/Extensions/IEnumerableExtensions.cs index 2855a3a..f6f02d8 100644 --- a/DarkUI/Extensions/IEnumerableExtensions.cs +++ b/DarkUI/Extensions/IEnumerableExtensions.cs @@ -1,7 +1,5 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; -using System.Text; namespace DarkUI { @@ -12,7 +10,7 @@ namespace DarkUI var last = items.LastOrDefault(); if (last == null) return false; - return item.Equals(last); // OR Object.ReferenceEquals(last, item) + return item.Equals(last); } internal static bool IsFirst(this IEnumerable items, T item) diff --git a/DarkUI/Win32/DarkControlScrollFilter.cs b/DarkUI/Win32/DarkControlScrollFilter.cs index bde8669..2d944f1 100644 --- a/DarkUI/Win32/DarkControlScrollFilter.cs +++ b/DarkUI/Win32/DarkControlScrollFilter.cs @@ -14,9 +14,8 @@ namespace DarkUI var hControlUnderMouse = Native.WindowFromPoint(new Point((int)m.LParam)); if (hControlUnderMouse == m.HWnd) - return false; // Already headed for the right control. + return false; - // Redirect the message to the control under the mouse. Native.SendMessage(hControlUnderMouse, (uint)m.Msg, m.WParam, m.LParam); return true; } diff --git a/Example/Forms/Dialogs/DialogAbout.cs b/Example/Forms/Dialogs/DialogAbout.cs index 9a5d340..e3cc762 100644 --- a/Example/Forms/Dialogs/DialogAbout.cs +++ b/Example/Forms/Dialogs/DialogAbout.cs @@ -11,7 +11,7 @@ namespace Example { InitializeComponent(); - lblVersion.Text = string.Format("Version: {0}", Application.ProductVersion.ToString()); + lblVersion.Text = $"Version: {Application.ProductVersion.ToString()}"; btnOk.Text = "Close"; } diff --git a/Example/Forms/Dialogs/DialogTest.cs b/Example/Forms/Dialogs/DialogTest.cs index b0a74d4..bfb7c59 100644 --- a/Example/Forms/Dialogs/DialogTest.cs +++ b/Example/Forms/Dialogs/DialogTest.cs @@ -11,7 +11,7 @@ namespace Example // Build dummy list data for (var i = 0; i < 100; i++) { - var item = new DarkListItem(string.Format("List item #{0}", i)); + var item = new DarkListItem($"List item #{i}"); lstTest.Items.Add(item); } @@ -19,13 +19,13 @@ namespace Example var childCount = 0; for (var i = 0; i < 20; i++) { - var node = new DarkTreeNode(string.Format("Root node #{0}", i)); + var node = new DarkTreeNode($"Root node #{i}"); node.ExpandedIcon = Icons.folder_open; node.Icon = Icons.folder_closed; for (var x = 0; x < 10; x++) { - var childNode = new DarkTreeNode(string.Format("Child node #{0}", childCount)); + var childNode = new DarkTreeNode($"Child node #{childCount}"); childNode.Icon = Icons.files; childCount++; node.Nodes.Add(childNode); diff --git a/Example/Forms/Docking/DockConsole.cs b/Example/Forms/Docking/DockConsole.cs index e7da119..2985d81 100644 --- a/Example/Forms/Docking/DockConsole.cs +++ b/Example/Forms/Docking/DockConsole.cs @@ -13,7 +13,7 @@ namespace Example // Build dummy list data for (var i = 0; i < 100; i++) { - var item = new DarkListItem(string.Format("List item #{0}", i)); + var item = new DarkListItem($"List item #{i}"); lstConsole.Items.Add(item); } } diff --git a/Example/Forms/Docking/DockHistory.cs b/Example/Forms/Docking/DockHistory.cs index 9cba5e5..19f5c48 100644 --- a/Example/Forms/Docking/DockHistory.cs +++ b/Example/Forms/Docking/DockHistory.cs @@ -13,7 +13,7 @@ namespace Example // Build dummy list data for (var i = 0; i < 100; i++) { - var item = new DarkListItem(string.Format("List item #{0}", i)); + var item = new DarkListItem($"List item #{i}"); lstHistory.Items.Add(item); } } diff --git a/Example/Forms/Docking/DockLayers.cs b/Example/Forms/Docking/DockLayers.cs index 9ed47ed..575fede 100644 --- a/Example/Forms/Docking/DockLayers.cs +++ b/Example/Forms/Docking/DockLayers.cs @@ -13,7 +13,7 @@ namespace Example // Build dummy list data for (var i = 0; i < 100; i++) { - var item = new DarkListItem(string.Format("List item #{0}", i)); + var item = new DarkListItem($"List item #{i}"); lstLayers.Items.Add(item); } } diff --git a/Example/Forms/Docking/DockProject.cs b/Example/Forms/Docking/DockProject.cs index 8b6ca6b..2e00e33 100644 --- a/Example/Forms/Docking/DockProject.cs +++ b/Example/Forms/Docking/DockProject.cs @@ -14,13 +14,13 @@ namespace Example var childCount = 0; for (var i = 0; i < 20; i++) { - var node = new DarkTreeNode(string.Format("Root node #{0}", i)); + var node = new DarkTreeNode($"Root node #{i}"); node.ExpandedIcon = Icons.folder_open; node.Icon = Icons.folder_closed; for (var x = 0; x < 10; x++) { - var childNode = new DarkTreeNode(string.Format("Child node #{0}", childCount)); + var childNode = new DarkTreeNode($"Child node #{childCount}"); childNode.Icon = Icons.files; childCount++; node.Nodes.Add(childNode); diff --git a/Example/Forms/MainForm.cs b/Example/Forms/MainForm.cs index b6316ed..244caab 100644 --- a/Example/Forms/MainForm.cs +++ b/Example/Forms/MainForm.cs @@ -43,7 +43,7 @@ namespace Example DockPanel.AddContent(_dockLayers); DockPanel.AddContent(_dockHistory); - // Add 3 dummy documents to the main document area of the dock panel + // Add dummy documents to the main document area of the dock panel DockPanel.AddContent(new DockDocument { DockText = "Document 1" }); DockPanel.AddContent(new DockDocument { DockText = "Document 2" }); DockPanel.AddContent(new DockDocument { DockText = "Document 3" }); diff --git a/Example/Program.cs b/Example/Program.cs index 683da87..7126327 100644 --- a/Example/Program.cs +++ b/Example/Program.cs @@ -5,9 +5,6 @@ namespace Example { static class Program { - /// - /// The main entry point for the application. - /// [STAThread] static void Main() {