From dbb6425658d0dc93498276bfe81ac1b7f36edabb Mon Sep 17 00:00:00 2001
From: Brendan MacLean <brendanx67@users.noreply.github.com>
Date: Thu, 26 Dec 2024 21:16:18 -0800
Subject: [PATCH] Skyline: Some last improvements to the SkylinePreviewForm
 based on ImageComparer (#3303)

Skyline: Some last improvements to the SkylinePreviewForm based on ImageComparer
- implement git revert function
- make ImageSource.disk show the modified state of the file on disk
- avoid drawing curved borders on PopupPickLists in Windows 11
- fixed race condition in RemoveAnnotationTest
---
 .../DevTools/ImageComparer/GitFileHelper.cs   |  13 ++++
 .../TestFunctional/RemoveAnnotationTest.cs    |   3 +
 pwiz_tools/Skyline/TestUtil/GitFileHelper.cs  |  13 ++++
 .../TestUtil/Properties/Resources.Designer.cs |  40 ++++++++++
 .../TestUtil/Properties/Resources.resx        |  12 +++
 .../TestUtil/Resources/filechanged.png        | Bin 0 -> 684 bytes
 .../TestUtil/Resources/fileunchanged.png      | Bin 0 -> 695 bytes
 .../TestUtil/Resources/fileunknown.png        | Bin 0 -> 464 bytes
 .../Skyline/TestUtil/Resources/undo.png       | Bin 0 -> 513 bytes
 .../ScreenshotPreviewForm.Designer.cs         |  20 ++++-
 .../Skyline/TestUtil/ScreenshotPreviewForm.cs |  70 ++++++++++++++++--
 .../ScreenshotProcessingExtensions.cs         |   9 ++-
 pwiz_tools/Skyline/TestUtil/TestUtil.csproj   |   4 +
 13 files changed, 174 insertions(+), 10 deletions(-)
 create mode 100644 pwiz_tools/Skyline/TestUtil/Resources/filechanged.png
 create mode 100644 pwiz_tools/Skyline/TestUtil/Resources/fileunchanged.png
 create mode 100644 pwiz_tools/Skyline/TestUtil/Resources/fileunknown.png
 create mode 100644 pwiz_tools/Skyline/TestUtil/Resources/undo.png

diff --git a/pwiz_tools/Skyline/Executables/DevTools/ImageComparer/GitFileHelper.cs b/pwiz_tools/Skyline/Executables/DevTools/ImageComparer/GitFileHelper.cs
index a881817f35..b48096a927 100644
--- a/pwiz_tools/Skyline/Executables/DevTools/ImageComparer/GitFileHelper.cs
+++ b/pwiz_tools/Skyline/Executables/DevTools/ImageComparer/GitFileHelper.cs
@@ -40,6 +40,19 @@ public static byte[] GetGitFileBinaryContent(string fullPath)
             });
         }
 
+        /// <summary>
+        /// Tells if a path has uncommitted changes with respect to the Git HEAD.
+        /// </summary>
+        /// <param name="path">The fully qualified path to a file or directory.</param>
+        /// <returns>True if the path has uncommitted changes, otherwise false.</returns>
+        public static bool IsModified(string path)
+        {
+            var output = RunGitCommand(GetPathInfo(path), "status --porcelain \"{RelativePath}\"");
+
+            // If there is any output the path has additions, deletions, or modifications
+            return !string.IsNullOrWhiteSpace(output);
+        }
+
         /// <summary>
         /// Gets a list of changed file paths under a specific directory.
         /// </summary>
diff --git a/pwiz_tools/Skyline/TestFunctional/RemoveAnnotationTest.cs b/pwiz_tools/Skyline/TestFunctional/RemoveAnnotationTest.cs
index d171ad1b40..fccb8ef217 100644
--- a/pwiz_tools/Skyline/TestFunctional/RemoveAnnotationTest.cs
+++ b/pwiz_tools/Skyline/TestFunctional/RemoveAnnotationTest.cs
@@ -56,6 +56,9 @@ protected override void DoTest()
             PropertyPath ppCarryoverProblem = ppPeptideResult.Property(AnnotationDef.ANNOTATION_PREFIX + "carryover problem");
             PropertyPath ppRtSchedulingProblem =
                 ppPeptideResult.Property(AnnotationDef.ANNOTATION_PREFIX + "RT scheduling problem");
+            WaitForConditionUI(() =>
+                documentGrid.FindColumn(ppCarryoverProblem) != null &&
+                documentGrid.FindColumn(ppRtSchedulingProblem) != null);
             RunUI(() =>
             {
                 var colCarryoverProblem = documentGrid.FindColumn(ppCarryoverProblem);
diff --git a/pwiz_tools/Skyline/TestUtil/GitFileHelper.cs b/pwiz_tools/Skyline/TestUtil/GitFileHelper.cs
index 3581dd6266..f316fc0290 100644
--- a/pwiz_tools/Skyline/TestUtil/GitFileHelper.cs
+++ b/pwiz_tools/Skyline/TestUtil/GitFileHelper.cs
@@ -41,6 +41,19 @@ public static byte[] GetGitFileBinaryContent(string fullPath)
             });
         }
 
+        /// <summary>
+        /// Tells if a path has uncommitted changes with respect to the Git HEAD.
+        /// </summary>
+        /// <param name="path">The fully qualified path to a file or directory.</param>
+        /// <returns>True if the path has uncommitted changes, otherwise false.</returns>
+        public static bool IsModified(string path)
+        {
+            var output = RunGitCommand(GetPathInfo(path), "status --porcelain \"{RelativePath}\"");
+
+            // If there is any output the path has additions, deletions, or modifications
+            return !string.IsNullOrWhiteSpace(output);
+        }
+        
         /// <summary>
         /// Gets a list of changed file paths under a specific directory.
         /// </summary>
diff --git a/pwiz_tools/Skyline/TestUtil/Properties/Resources.Designer.cs b/pwiz_tools/Skyline/TestUtil/Properties/Resources.Designer.cs
index 08d22d88d5..28ef2d302e 100644
--- a/pwiz_tools/Skyline/TestUtil/Properties/Resources.Designer.cs
+++ b/pwiz_tools/Skyline/TestUtil/Properties/Resources.Designer.cs
@@ -100,6 +100,36 @@ internal static System.Drawing.Bitmap DiskFailure {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap filechanged {
+            get {
+                object obj = ResourceManager.GetObject("filechanged", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap fileunchanged {
+            get {
+                object obj = ResourceManager.GetObject("fileunchanged", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap fileunknown {
+            get {
+                object obj = ResourceManager.GetObject("fileunknown", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
@@ -210,6 +240,16 @@ internal static System.Drawing.Bitmap textbutton {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        internal static System.Drawing.Bitmap undo {
+            get {
+                object obj = ResourceManager.GetObject("undo", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
diff --git a/pwiz_tools/Skyline/TestUtil/Properties/Resources.resx b/pwiz_tools/Skyline/TestUtil/Properties/Resources.resx
index 062f1dfaeb..7733ed23cd 100644
--- a/pwiz_tools/Skyline/TestUtil/Properties/Resources.resx
+++ b/pwiz_tools/Skyline/TestUtil/Properties/Resources.resx
@@ -130,6 +130,15 @@
   <data name="DiskFailure" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\DiskFailure.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="filechanged" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\filechanged.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="fileunchanged" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\fileunchanged.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="fileunknown" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\fileunknown.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="gitsource" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\gitsource.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -163,6 +172,9 @@
   <data name="textbutton" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\textbutton.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="undo" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\undo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="webdestination" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\webdestination.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
diff --git a/pwiz_tools/Skyline/TestUtil/Resources/filechanged.png b/pwiz_tools/Skyline/TestUtil/Resources/filechanged.png
new file mode 100644
index 0000000000000000000000000000000000000000..9dc36b253c29825951015ae9429a70ae65f9976b
GIT binary patch
literal 684
zcmV;d0#p5oP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0zpYcK~y+Tjgw1g
z6Hyd~|GCNJHIv66v1yuA6q?dlF^b?y6mcbj3qgD!by1{97lMzNv?3~KQCtY3#fGYg
zh|-NHLKiNIo2pBtMeU-bB*l_+?BqR@IL;)uu|q5NgTq|T{r@xPUhZL3RfW!-TQ^m4
zNvyBeLU0Q>*>f6xzn`J026_QKV$ln#EX)54egF2*4K<ZYY4V0g4?^p#i(|)6;rX*s
zq|@m}+ZyXG;PH6y@WFkE;u1zihG|w~xt0GNVP)vrWuKYWY4W>P!`>%J%!>+GxeAl4
zeH8`m9Kq}OPOAD#^9aI^@A!1^046$vxO8<lqKOmO^YIltSrKo}b-^L#snSTjgQ>xo
z8lIeh>UAL!yNq9p61b<25SUINq$V+VodH{E-kSlEe)m?Le=!P6iwnHh4o4&c$JTB*
zTX~o^wIclOJ%Y+t_+X(HBV;Zy4BG}5tWFC!!49iG0C#5x>|P$Mokfl3;s5*+m0fMr
zVua+UzJPUD!P?BQXhm3#hioFSax56Lc13m@+A=ek7Od1_gn%(Vg<3%ZU(LhG0zoIK
zhudbt_>qlNVT8E0?|@RQKq*%t=VZ(bMKOE#8p=7Po>K}Xa9!Qnf7X6;B-q!Fa#lh`
zGZ(}XLh%8F2Ckr(Eut*Rs4V6X=<TEO)ezsl{Y?AW^N@c^C`!QG<1wVh#*xpIkV`J0
z<!BFlhYnNuYMSGG?@X^MOn!jZ?E*2Iv5?6k72XDE^OpMlO7zjb7>jFT4g3K^j~$Tp
Sqs9sV0000<MNUMnLSTaTk~a+i

literal 0
HcmV?d00001

diff --git a/pwiz_tools/Skyline/TestUtil/Resources/fileunchanged.png b/pwiz_tools/Skyline/TestUtil/Resources/fileunchanged.png
new file mode 100644
index 0000000000000000000000000000000000000000..331a1509e97f7b28bf214954134ca8d738927db0
GIT binary patch
literal 695
zcmV;o0!aOdP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0!&FnK~y+TjgwtS
z6k!yGpZU~XQ_FRwP#1#QtRyk$2MYR=GDrxCz%0><pr8mNj8M9ef{MEEM${0rus_Hm
zk%+vh3onAa5b1{uvm!TFTz9qI)g5=|Yi1p_%_1K-Fr0bccg}%1ij)$Ao7b*N@0d6G
z{5R54(<nW9jI69I#cWMu1Q=Cyu~Mq4`p+`n-?)B74h|0L@@bDz!pvC^C5Own*V>HB
z<(eK_XTbqBn~jG0I=tR7nwlETuFlLT|6AerGPE<kcr#}fqq+U|SB5+)32K-)b&7<k
zDV8S-+N(F1sySv?_^y1S?BQNEH)JsE*{GY2kodC=o5xGXxg3(bep4AsG@$lXjr3)I
z<Fl^|i!zRtAgdgUh;!bdvvw<&E_ahKrbP{ZB3|}Amz@K*5Q}?Aw`-&%No*+^KStls
zeX^gTN4s!mzas;SX^BO&^)`{1GE5|5?5`kE(4^pX#W;_9T1eEE&>y)^Xp_UV#3Fj#
zolJ%xq*pksU=hi5o%S;t9HHh}1t0pl(ZomI+pVT07J>fNrzL*QZ)qXjx`K}KAw~jj
z_SNU;!67C>0n)5-yg0bbw8SDZlXCT;1^Lcm?iRnr6BuTHV=e*RY)oX0PiCz>525`1
zpA-2j4^Y{Dh<ITkp!zASUxzOkL^ak@HS(Ofl&?Qy%I70a?W|M=+%8VE7E;>02cLg}
z(4^GImn=<nuzPg@1#5~-`Fx`1tVxZtb;sqCFAoT7VYG<CHs=m9y$<Y?nWl6O<FqeS
dRqJOBzW|iIJQ$msuEYQU002ovPDHLkV1jY2JAeQH

literal 0
HcmV?d00001

diff --git a/pwiz_tools/Skyline/TestUtil/Resources/fileunknown.png b/pwiz_tools/Skyline/TestUtil/Resources/fileunknown.png
new file mode 100644
index 0000000000000000000000000000000000000000..c41695e4a097eb48f29f2e4200f0c8cca1c8d826
GIT binary patch
literal 464
zcmV;>0WbcEP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0cA-<K~y+T#gn~C
z13?r<zibj^waBc*zm3E~4JcxvR$^tPjg^HWqOAyGp-6(2f{M1HLPQJk0mRZL5Yh=k
z3R4JKgCuS?T9{emx??7ofe~ZnfeXWYcMf-o>v0?hjQyQ$$F$6^vkWbuVRn82x~_Zp
zRT(B=6<uF-D5XCZ%lCG-oOC+vwwK?qQn;rkrf24GaefNJFv?@Q)GQ!`;OOuGrfDG_
zKjybCl~I2CLUpm;$~zzT2#lURAd`E8pT5IOZTM{);YJ0Qu|eMPjr0pIsVqn~k3h}@
zaqDWO7Y*hsPer5xlFNgb1q8>sp^fxlV>1E2^}$mSsi4_*5SSc*66rv;RY$463vH<5
zsfbiiKhXyo3BgDek-W|0#;c+@9O9{nRG<!p@pxZEDrv#zE1_Uh+%>5@6_E-~I&CDz
z6+AC%cv=b~v)GR7sTQ7!NCki4{{=O#b2V(W*P=0Zt$|Ox$k0};A@^JW0000<MNUMn
GLSTZ}K)@3K

literal 0
HcmV?d00001

diff --git a/pwiz_tools/Skyline/TestUtil/Resources/undo.png b/pwiz_tools/Skyline/TestUtil/Resources/undo.png
new file mode 100644
index 0000000000000000000000000000000000000000..d0f4b3103849fe27faab279fab92987a02dc517d
GIT binary patch
literal 513
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6-E$sR$z
z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8ZKG?e4<x9|RZdT|OBo
z!dc)ES<Jw|cNl~jkLRyQVPIfn_H=O!u{iy9qM_em2LadrE-uqfn{2V({ETg#fZ!$p
zbq_`%R(6lZBa9D3WE!S1UkE&+;OF4}aO<6=%eSPjkg+`FmT>XYs=0S->)kgWkY8A*
zs3hie<4WW-*_E$k8;Ti>8RoD0b>a+vYUH-Rdp&ioT85Xze$Pvrx@z8%%&LqubC)d{
zvz}R=|NOE~Md{k<GkemWUH16aGV{L66SG^5#p@InsWXU|#_o4xx^m_nV~jg9ThY$^
z49`h5Ga|2DXK&s-t3%>|my6l#!v~ohZf`SI`gMzwLy@DdaaEk)MejAu@`dL_8K$|I
z$UkOe*z>(OEw1|g`F~Gyzx``kB{%zKYG~-{i|hLzO54PysO<Q?G!z&{swJ)wB`Jv|
zsaDBFsX&Us$iT=z*T7uY$TGyh$jaEj%D_O|07Pz!UhoP<LvDUbW?Cg~4aeCe!hjkW
NJYD@<);T3K0RWj#yb}Nb

literal 0
HcmV?d00001

diff --git a/pwiz_tools/Skyline/TestUtil/ScreenshotPreviewForm.Designer.cs b/pwiz_tools/Skyline/TestUtil/ScreenshotPreviewForm.Designer.cs
index 738cfd2231..78d9d54695 100644
--- a/pwiz_tools/Skyline/TestUtil/ScreenshotPreviewForm.Designer.cs
+++ b/pwiz_tools/Skyline/TestUtil/ScreenshotPreviewForm.Designer.cs
@@ -52,12 +52,13 @@ private void InitializeComponent()
             this.toolStripRefresh = new System.Windows.Forms.ToolStripButton();
             this.toolStripSave = new System.Windows.Forms.ToolStripButton();
             this.toolStripSaveAndContinue = new System.Windows.Forms.ToolStripButton();
+            this.toolStripRevert = new System.Windows.Forms.ToolStripButton();
             this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
             this.toolStripAutoSize = new System.Windows.Forms.ToolStripButton();
             this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
             this.toolStripGotoWeb = new System.Windows.Forms.ToolStripButton();
             this.toolStripDescription = new System.Windows.Forms.ToolStripLabel();
-            this.toolStripPickColorButton = new AlphaColorPickerButton();
+            this.toolStripPickColorButton = new pwiz.SkylineTestUtil.AlphaColorPickerButton();
             ((System.ComponentModel.ISupportInitialize)(this.oldScreenshotPictureBox)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.newScreenshotPictureBox)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.previewSplitContainer)).BeginInit();
@@ -149,11 +150,12 @@ private void InitializeComponent()
             // buttonImageSource
             // 
             this.buttonImageSource.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonImageSource.Image = global::pwiz.SkylineTestUtil.Properties.Resources.save;
+            this.buttonImageSource.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.buttonImageSource.Image = global::pwiz.SkylineTestUtil.Properties.Resources.fileunknown;
             this.buttonImageSource.Location = new System.Drawing.Point(455, 4);
             this.buttonImageSource.Margin = new System.Windows.Forms.Padding(1);
             this.buttonImageSource.Name = "buttonImageSource";
-            this.buttonImageSource.Size = new System.Drawing.Size(22, 22);
+            this.buttonImageSource.Size = new System.Drawing.Size(23, 23);
             this.buttonImageSource.TabIndex = 1;
             this.buttonImageSource.TabStop = false;
             this.helpTip.SetToolTip(this.buttonImageSource, "Switch Source (Ctrl-Tab)\r\nCurrent: Disk");
@@ -232,6 +234,7 @@ private void InitializeComponent()
             this.toolStripRefresh,
             this.toolStripSave,
             this.toolStripSaveAndContinue,
+            this.toolStripRevert,
             this.toolStripSeparator1,
             this.toolStripAutoSize,
             this.toolStripPickColorButton,
@@ -296,6 +299,15 @@ private void InitializeComponent()
             this.toolStripSaveAndContinue.ToolTipText = "Save and Continue (F6)";
             this.toolStripSaveAndContinue.Click += new System.EventHandler(this.toolStripSaveAndContinue_Click);
             // 
+            // toolStripRevert
+            // 
+            this.toolStripRevert.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.toolStripRevert.Image = global::pwiz.SkylineTestUtil.Properties.Resources.undo;
+            this.toolStripRevert.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.toolStripRevert.Name = "toolStripRevert";
+            this.toolStripRevert.Size = new System.Drawing.Size(23, 22);
+            this.toolStripRevert.ToolTipText = "Revert (Ctrl-Z)";
+            // 
             // toolStripSeparator1
             // 
             this.toolStripSeparator1.Name = "toolStripSeparator1";
@@ -339,6 +351,7 @@ private void InitializeComponent()
             // 
             this.toolStripPickColorButton.BackColor = System.Drawing.SystemColors.Control;
             this.toolStripPickColorButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.toolStripPickColorButton.Image = ((System.Drawing.Image)(resources.GetObject("toolStripPickColorButton.Image")));
             this.toolStripPickColorButton.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.toolStripPickColorButton.Name = "toolStripPickColorButton";
             this.toolStripPickColorButton.SelectedColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(255)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
@@ -405,5 +418,6 @@ private void InitializeComponent()
         private System.Windows.Forms.Label labelNewSize;
         private System.Windows.Forms.PictureBox pictureMatching;
         private AlphaColorPickerButton toolStripPickColorButton;
+        private System.Windows.Forms.ToolStripButton toolStripRevert;
     }
 }
\ No newline at end of file
diff --git a/pwiz_tools/Skyline/TestUtil/ScreenshotPreviewForm.cs b/pwiz_tools/Skyline/TestUtil/ScreenshotPreviewForm.cs
index 720d9c1001..ce68dd9b8a 100644
--- a/pwiz_tools/Skyline/TestUtil/ScreenshotPreviewForm.cs
+++ b/pwiz_tools/Skyline/TestUtil/ScreenshotPreviewForm.cs
@@ -293,6 +293,7 @@ private void UpdatePreviewImages()
         {
             lock (_lock)
             {
+                UpdateImageSourceButtons();
                 helpTip.SetToolTip(oldScreenshotLabel, _oldScreenshot.FileLoaded);
                 SetPreviewSize(labelOldSize, _oldScreenshot);
                 SetPreviewImage(oldScreenshotPictureBox, _oldScreenshot, _diff);
@@ -896,7 +897,8 @@ private void PauseAtNextScreenshot()
 
         private bool SaveScreenshot()
         {
-            if (File.Exists(_fileToSave) && !FileEx.IsWritable(_fileToSave))
+            string filePath = _fileToSave;
+            if (File.Exists(filePath) && !IsWritable(filePath))
             {
                 ShowMessage(LineSeparate(string.Format("The file {0} is locked.", _fileToSave),
                     "Check that it is not open in another program such as TortoiseIDiff."));
@@ -904,20 +906,40 @@ private bool SaveScreenshot()
             }
             try
             {
-                string screenshotDir = Path.GetDirectoryName(_fileToSave) ?? string.Empty;
+                string screenshotDir = Path.GetDirectoryName(filePath) ?? string.Empty;
                 Assume.IsFalse(string.IsNullOrEmpty(screenshotDir));    // Because ReSharper complains about possible null
                 Directory.CreateDirectory(screenshotDir);
 
-                _newScreenshot.Image.Save(_fileToSave);
+                _newScreenshot.Image.Save(filePath);
                 return true;
             }
             catch (Exception e)
             {
-                PreviewMessageDlg.ShowWithException(this, string.Format("Failed to save screenshot {0}", _fileToSave), e);
+                PreviewMessageDlg.ShowWithException(this, string.Format("Failed to save screenshot {0}", filePath), e);
                 return false;
             }
         }
 
+        private void Revert()
+        {
+            string filePath = _fileToSave;
+            if (File.Exists(filePath) && !IsWritable(filePath))
+            {
+                ShowMessage(LineSeparate(string.Format("The file {0} is locked.", filePath),
+                    "Check that it is not open in another program such as TortoiseIDiff."));
+                return;
+            }
+            try
+            {
+                GitFileHelper.RevertFileToHead(filePath);
+                RefreshOldScreenshot();
+            }
+            catch (Exception e)
+            {
+                ShowMessageWithException(string.Format("Failed to revert screenshot {0}", filePath), e);
+            }
+        }
+
         private void SaveAndContinue()
         {
             if (SaveScreenshot())
@@ -1056,7 +1078,28 @@ private void UpdateImageSourceButtons()
                     break;
                 case ImageSource.disk:
                 default:
-                    buttonImageSource.Image = Resources.save;
+                    bool? changed = null;
+                    var filePath = _fileToSave;
+                    if (File.Exists(filePath))
+                    {
+                        try
+                        {
+                            changed = GitFileHelper.IsModified(filePath);
+                        }
+                        catch (Exception)
+                        {
+                            // Ignore and leave changed null
+                        }
+                    }
+
+                    if (!changed.HasValue)
+                    {
+                        buttonImageSource.Image = Resources.fileunknown;
+                    }
+                    else
+                    {
+                        buttonImageSource.Image = changed.Value ? Resources.filechanged : Resources.fileunchanged;
+                    }
                     helpTip.SetToolTip(buttonImageSource, _defaultImageSourceTipText);
                     break;
             }
@@ -1094,6 +1137,11 @@ private void toolStripSaveAndContinue_Click(object sender, EventArgs e)
             SaveAndContinue();
         }
 
+        private void toolStripRevert_Click(object sender, EventArgs e)
+        {
+            Revert();
+        }
+
         private void toolStripGotoWeb_Click(object sender, EventArgs e)
         {
             GotoLink();
@@ -1192,6 +1240,13 @@ private void ScreenshotPreviewForm_KeyDown(object sender, KeyEventArgs e)
                         e.Handled = true;
                     }
                     break;
+                case Keys.Z:
+                    if (e.Control)
+                    {
+                        Revert();
+                        e.Handled = true;
+                    }
+                    break;
             }
         }
 
@@ -1207,6 +1262,11 @@ private void CopyBitmap(Bitmap bitmap)
             }
         }
 
+        public static bool IsWritable(string path)
+        {
+            return FileEx.IsWritable(path);
+        }
+
         private string LineSeparate(params string[] lines)
         {
             return TextUtil.LineSeparate(lines);
diff --git a/pwiz_tools/Skyline/TestUtil/ScreenshotProcessingExtensions.cs b/pwiz_tools/Skyline/TestUtil/ScreenshotProcessingExtensions.cs
index c10429015f..d735e0aa95 100644
--- a/pwiz_tools/Skyline/TestUtil/ScreenshotProcessingExtensions.cs
+++ b/pwiz_tools/Skyline/TestUtil/ScreenshotProcessingExtensions.cs
@@ -41,11 +41,12 @@ public static class ScreenshotProcessingExtensions
 
         public static Bitmap CleanupBorder(this Bitmap bmp, bool toolWindow = false)
         {
+            bool isWindows11 = IsWindows11();
             if (!toolWindow)
             {
-                return bmp.CleanupBorder(new Rectangle(0, 0, bmp.Width, bmp.Height), 8);
+                return bmp.CleanupBorder(new Rectangle(0, 0, bmp.Width, bmp.Height), isWindows11 ? 8 : 0);
             }
-            else if (!IsWindows11())
+            else if (!isWindows11)
             {
                 // Floating dockable forms have only a transparent border at the top
                 return bmp.CleanupBorder(new Rectangle(0, 0, bmp.Width, 1), 0);
@@ -77,6 +78,10 @@ private static Bitmap CleanupBorder(this Bitmap bmp, Color? color, Rectangle rec
             // All white border means it is actually a graph so don't draw anything on it
             if (bestBorderColor.ToArgb() == Color.White.ToArgb())
                 return bmp;
+            // If there is supposed to be a corner curve but there is just one color, avoid
+            // drawing a curved corner on top of the otherwise rectangular border.
+            if (cornerRadius != 0 && colorCounts.Count == 1)
+                return bmp;
             return bmp.CleanupBorderInternal(color ?? bestBorderColor, rect, cornerRadius);
         }
 
diff --git a/pwiz_tools/Skyline/TestUtil/TestUtil.csproj b/pwiz_tools/Skyline/TestUtil/TestUtil.csproj
index c34eeedad0..6658eeffb0 100644
--- a/pwiz_tools/Skyline/TestUtil/TestUtil.csproj
+++ b/pwiz_tools/Skyline/TestUtil/TestUtil.csproj
@@ -304,6 +304,10 @@
     <None Include="Resources\noscreenshot.png" />
     <None Include="Resources\hand-cur.bmp" />
     <None Include="Resources\gitsource.png" />
+    <None Include="Resources\fileunchanged.png" />
+    <None Include="Resources\filechanged.png" />
+    <None Include="Resources\fileunknown.png" />
+    <None Include="Resources\undo.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.