Add menu 'Copy Name', fix scrollbar, update to v0.5.1

ottools · Aug 8, 2020 · 2bccd9e · 2bccd9e
1 parent fd973d5
commit 2bccd9e
Show file tree

Hide file tree

Showing 13 changed files with 41 additions and 34 deletions.
diff --git a/Source/Controls/ListBase.cs b/Source/Controls/ListBase.cs
@@ -19,7 +19,7 @@ public enum ListBaseLayout
 
     public class ListBase<T> : DarkScrollView
     {
-        private ListBaseLayout m_layout;
+        private readonly ListBaseLayout m_layout;
         private int m_itemSize;
         private int m_anchoredItemStart;
         private int m_anchoredItemEnd;
@@ -98,6 +98,7 @@ public int ItemSize
                 if (value != m_itemSize)
                 {
                     m_itemSize = value;
+                    Ticks = value;
                     UpdateListBox();
                 }
             }

diff --git a/Source/MainForm.cs b/Source/MainForm.cs
@@ -1028,6 +1028,7 @@ private void ItemsListBoxContextMenu_Opening(object sender, CancelEventArgs e)
                 itemsListBoxContextMenu.Items.Add("-");
                 itemsListBoxContextMenu.Items.Add("Copy Server ID");
                 itemsListBoxContextMenu.Items.Add("Copy Client ID");
+                itemsListBoxContextMenu.Items.Add("Copy Name");
             }
         }
 
@@ -1051,6 +1052,10 @@ private void ItemsListBoxContextMenu_ItemClicked(object sender, ToolStripItemCli
                 case "Copy Client ID":
                     Clipboard.SetText(CurrentServerItem.ClientId.ToString());
                     break;
+
+                case "Copy Name":
+                    Clipboard.SetText(CurrentServerItem.NameXml);
+                    break;
             }
         }
 

diff --git a/Source/PluginInterface/PluginInterface.csproj b/Source/PluginInterface/PluginInterface.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>PluginInterface</RootNamespace>
     <AssemblyName>PluginInterface</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>

diff --git a/Source/PluginInterface/Properties/AssemblyInfo.cs b/Source/PluginInterface/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.5.0.0")]
-[assembly: AssemblyFileVersion("0.5.0.0")]
+[assembly: AssemblyVersion("0.5.1.0")]
+[assembly: AssemblyFileVersion("0.5.1.0")]
diff --git a/Source/PluginInterface/Properties/Resources.Designer.cs b/Source/PluginInterface/Properties/Resources.Designer.cs
diff --git a/Source/PluginOne/Properties/AssemblyInfo.cs b/Source/PluginOne/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.5.0.0")]
-[assembly: AssemblyFileVersion("0.5.0.0")]
+[assembly: AssemblyVersion("0.5.1.0")]
+[assembly: AssemblyFileVersion("0.5.1.0")]
diff --git a/Source/PluginThree/PluginThree.csproj b/Source/PluginThree/PluginThree.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>PluginThree</RootNamespace>
     <AssemblyName>PluginThree</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>

diff --git a/Source/PluginThree/Properties/AssemblyInfo.cs b/Source/PluginThree/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.5.0.0")]
-[assembly: AssemblyFileVersion("0.5.0.0")]
+[assembly: AssemblyVersion("0.5.1.0")]
+[assembly: AssemblyFileVersion("0.5.1.0")]
diff --git a/Source/PluginTwo/PluginTwo.csproj b/Source/PluginTwo/PluginTwo.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>PluginTwo</RootNamespace>
     <AssemblyName>PluginTwo</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>

diff --git a/Source/PluginTwo/Properties/AssemblyInfo.cs b/Source/PluginTwo/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.5.0.0")]
-[assembly: AssemblyFileVersion("0.5.0.0")]
+[assembly: AssemblyVersion("0.5.1.0")]
+[assembly: AssemblyFileVersion("0.5.1.0")]
diff --git a/Source/Properties/AssemblyInfo.cs b/Source/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.5.0.0")]
-[assembly: AssemblyFileVersion("0.5.0.0")]
+[assembly: AssemblyVersion("0.5.1.0")]
+[assembly: AssemblyFileVersion("0.5.1.0")]
diff --git a/ThirdParty/DarkUI/Controls/DarkScrollBar.cs b/ThirdParty/DarkUI/Controls/DarkScrollBar.cs
@@ -377,9 +377,7 @@ public void ScrollBy(int offset)
         public void ScrollByPhysical(int offsetInPixels)
         {
             var isVert = _scrollOrientation == DarkScrollOrientation.Vertical;
-
             var thumbPos = isVert ? (_thumbArea.Top - _trackArea.Top) : (_thumbArea.Left - _trackArea.Left);
-
             var newPosition = thumbPos - offsetInPixels;
 
             ScrollToPhysical(newPosition);
@@ -413,7 +411,6 @@ public void UpdateScrollBar()
 
             // Thumb
             UpdateThumb();
-
             Invalidate();
         }
 

diff --git a/ThirdParty/DarkUI/Controls/DarkScrollBase.cs b/ThirdParty/DarkUI/Controls/DarkScrollBase.cs
@@ -107,6 +107,8 @@ public bool HideScrollBars
             }
         }
 
+        public int Ticks { get; set; }
+
         public bool HorizontalScrollBarHidden
         {
             get => _horizontalScrollBarHidden;
@@ -144,6 +146,8 @@ protected DarkScrollBase()
             _dragTimer = new Timer();
             _dragTimer.Interval = 1;
             _dragTimer.Tick += DragTimer_Tick;
+
+            Ticks = 1;
         }
 
         #endregion
@@ -343,16 +347,16 @@ protected override void OnMouseWheel(MouseEventArgs e)
             if (!horizontal)
             {
                 if (e.Delta > 0)
-                    _vScrollBar.ScrollByPhysical(3);
+                    _vScrollBar.ScrollBy(-Ticks);
                 else if (e.Delta < 0)
-                    _vScrollBar.ScrollByPhysical(-3);
+                    _vScrollBar.ScrollBy(Ticks);
             }
             else
             {
                 if (e.Delta > 0)
-                    _hScrollBar.ScrollByPhysical(3);
+                    _hScrollBar.ScrollBy(-Ticks);
                 else if (e.Delta < 0)
-                    _hScrollBar.ScrollByPhysical(-3);
+                    _hScrollBar.ScrollBy(Ticks);
             }
         }