fix overwriting clipboard, weird LinkLabel style

1. fix problem where running UI tests would not restore the clipboard's pre-test text 2. fix issue where going from dark to light theme would not restore LinkLabel colors to default
molsonkiko · Jan 14, 2024 · 5a47ef5 · 5a47ef5
1 parent 976a18f
commit 5a47ef5
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,14 +18,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### To Be Fixed
 
 - Closing HTML/XML tags works inconsistently in Notepad++ v7.3.3.
-- Make [TestRunner.cs](/NppCSharpPluginPack/Tests/TestRunner.cs) restore clipboard after tests.
-- Fix styling of link labels. See DarkModeTestForm.
 
 ## [0.0.2] - (UNRELEASED) YYYY-MM-DD
 
 ### Changed
 
-1. Fix docs to remove references to JsonTools.
+1. Remove references and links to JsonTools (they now go to this project's GitHub repo).
+
+### Fixed
+
+1. [TestRunner.cs](/NppCSharpPluginPack/Tests/TestRunner.cs) now restores clipboard text after tests.
+2. Link label text and background now correctly switches back to defaults when going from a dark theme to default styles.
 
 ## [0.0.1] - 2024-01-13
 

diff --git a/NppCSharpPluginPack/Properties/AssemblyInfo.cs b/NppCSharpPluginPack/Properties/AssemblyInfo.cs
@@ -28,5 +28,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.0.1.1")]
-[assembly: AssemblyFileVersion("0.0.1.1")]
+[assembly: AssemblyVersion("0.0.1.2")]
+[assembly: AssemblyFileVersion("0.0.1.2")]
diff --git a/NppCSharpPluginPack/Tests/UserInterfaceTests.cs b/NppCSharpPluginPack/Tests/UserInterfaceTests.cs
@@ -202,6 +202,8 @@ public static bool ExecuteFileManipulation(FileManipulation command, List<string
                     return true;
                 }
                 Main.selectionRememberingForm.CopySelectionsToStartEndsButton.PerformClick();
+                // need to do this, otherwise your clipboard will be overwritten
+                lastClipboardValue = Clipboard.GetText();
                 messages.Add("Copied selections to clipboard with selection remembering form");
                 break;
             case FileManipulation.SaveSelectionsWithSelectionRememberingForm:

diff --git a/NppCSharpPluginPack/Utils/FormStyle.cs b/NppCSharpPluginPack/Utils/FormStyle.cs
@@ -54,12 +54,6 @@ public static void ApplyStyle(Control ctrl, bool useNppStyle, bool darkMode = fa
                         child.BackColor = SystemColors.Window; // white background
                         child.ForeColor = SystemColors.WindowText;
                     }
-                    else if (child is LinkLabel llbl)
-                    {
-                        llbl.LinkColor = Color.Blue;
-                        llbl.ActiveLinkColor = Color.Red;
-                        llbl.VisitedLinkColor = Color.Purple;
-                    }
                     else if (child is DataGridView dgv)
                     {
                         dgv.EnableHeadersVisualStyles = true;
@@ -74,6 +68,12 @@ public static void ApplyStyle(Control ctrl, bool useNppStyle, bool darkMode = fa
                         // buttons should be a bit darker but everything else is the same color as the background
                         child.BackColor = (child is Button) ? SlightlyDarkControl : SystemColors.Control;
                         child.ForeColor = SystemColors.ControlText;
+                        if (child is LinkLabel llbl)
+                        {
+                            llbl.LinkColor = Color.Blue;
+                            llbl.ActiveLinkColor = Color.Red;
+                            llbl.VisitedLinkColor = Color.Purple;
+                        }
                     }
                 }
                 return;

diff --git a/README.md b/README.md
@@ -35,7 +35,7 @@ Alternatively, you can follow these [installation instructions](https://npp-user
 
 ## System Requirements ##
 
-This plugin is verified to work on versions of Notepad++ as old as [v7.3.3](https://notepad-plus-plus.org/downloads/v7.3.3/), but it has some bugs, mainly with HTML/XML tag matching.
+This plugin is verified to work on versions of Notepad++ as old as [v7.3.3](https://notepad-plus-plus.org/downloads/v7.3.3/), but it may have some bugs ([see the CHANGELOG](/CHANGELOG.md) to see the what bugs may still exist).
 
 It has also been tested and verified to work normally on the newest versions of Notepad++, [v8.6.1](https://notepad-plus-plus.org/downloads/v8.6.1/) and [v8.6.2 RC](https://community.notepad-plus-plus.org/topic/25341/notepad-v8-6-2-release-candidate/19).
 

diff --git a/most recent errors.txt b/most recent errors.txt
@@ -1,4 +1,4 @@
-Test results for CSharpPluginPack v0.0.1.1 on Notepad++ 8.5.8 64bit
+Test results for CSharpPluginPack v0.0.1.2 on Notepad++ 8.5.8 64bit
 NOTE: Ctrl-F (regular expressions *on*) for "Failed [1-9]\d*" to find all failed tests
 No tests failed
 =========================