Merge branch 'develop' into prod

d2phap · Dec 29, 2023 · 3acdfa4 · 3acdfa4
2 parents 31d9dd1 + d439deb
commit 3acdfa4
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 10 deletions.
diff --git a/Source/Components/ImageGlass.Base/Types/Const.cs b/Source/Components/ImageGlass.Base/Types/Const.cs
@@ -87,7 +87,7 @@ public static class Const
     /// <summary>
     /// Gets built-in image formats
     /// </summary>
-    public const string IMAGE_FORMATS = ".3fr;.apng;.ari;.arw;.avif;.b64;.bay;.bmp;.cap;.cr2;.cr3;.crw;.cur;.cut;.dcr;.dcs;.dds;.dib;.dng;.drf;.eip;.emf;.erf;.exif;.exr;.fff;.fits;.flif;.gif;.gifv;.gpr;.hdr;.heic;.heif;.ico;.iiq;.jp2;.jpe;.jpeg;.jpg;.jxl;.k25;.kdc;.mdc;.mef;.mjpeg;.mos;.mrw;.nef;.nrw;.obm;.orf;.pbm;.pcx;.pef;.pgm;.png;.ppm;.psb;.psd;.ptx;.pxn;.qoi;.r3d;.raf;.raw;.rw2;.rwl;.rwz;.sr2;.srf;.srw;.svg;.tga;.tif;.tiff;.viff;.webp;.wmf;.wpg;.x3f;.xbm;.xpm;.xv";
+    public const string IMAGE_FORMATS = ".3fr;.apng;.ari;.arw;.avif;.b64;.bay;.bmp;.cap;.cr2;.cr3;.crw;.cur;.cut;.dcr;.dcs;.dds;.dib;.dng;.drf;.eip;.emf;.erf;.exif;.exr;.fff;.fits;.flif;.gif;.gifv;.gpr;.hdr;.heic;.heif;.ico;.iiq;.jfif;.jp2;.jpe;.jpeg;.jpg;.jxl;.k25;.kdc;.mdc;.mef;.mjpeg;.mos;.mrw;.nef;.nrw;.obm;.orf;.pbm;.pcx;.pef;.pgm;.png;.ppm;.psb;.psd;.ptx;.pxn;.qoi;.r3d;.raf;.raw;.rw2;.rwl;.rwz;.sr2;.srf;.srw;.svg;.tga;.tif;.tiff;.viff;.webp;.wmf;.wpg;.x3f;.xbm;.xpm;.xv";
 
     /// <summary>
     /// Number format to use for save/restore ImageGlass settings

diff --git a/Source/Components/ImageGlass.Settings/WindowPlacement/WindowSettings.cs b/Source/Components/ImageGlass.Settings/WindowPlacement/WindowSettings.cs
@@ -64,15 +64,17 @@ public static void SetPlacementToWindow(Form frm, WindowPlacement wp)
 
         try
         {
+            _ = SetWindowPlacement(frm.Handle, ref wp);
+
+            // Windows 10 hack: if taskbar is on top, the window position is not correct
+            // https://github.com/d2phap/ImageGlass/issues/1790
             if (wp.showCmd == WindowState.Normal)
             {
-                frm.SetBounds(wp.normalPosition.Left, wp.normalPosition.Top,
-                wp.normalPosition.Right - wp.normalPosition.Left,
-                wp.normalPosition.Bottom - wp.normalPosition.Top);
-            }
-            else
-            {
-                _ = SetWindowPlacement(frm.Handle, ref wp);
+                frm.SetBounds(
+                    wp.normalPosition.Left,
+                    wp.normalPosition.Top,
+                    wp.normalPosition.Right - wp.normalPosition.Left,
+                    wp.normalPosition.Bottom - wp.normalPosition.Top);
             }
         }
         catch { }

diff --git a/Source/Components/ImageGlass.Views/DXCanvas.cs b/Source/Components/ImageGlass.Views/DXCanvas.cs
@@ -1123,6 +1123,17 @@ protected override void Dispose(bool disposing)
         DisposeWeb2Control();
     }
 
+    protected override void OnVerticalBlankTickerWaitError(VerticalBlankTickerErrorEventArgs e)
+    {
+        base.OnVerticalBlankTickerWaitError(e);
+
+        if (!EnableDebug)
+        {
+            Thread.Sleep(1000);
+            e.Handled = true;
+        }
+    }
+
     protected override void OnMouseClick(MouseEventArgs e)
     {
         // disable the default OnMouseClick
@@ -1556,10 +1567,20 @@ protected override void OnRender(IGraphics g)
         // navigation layer
         DrawNavigationLayer(g);
 
-
         if (EnableDebug)
         {
-            var text = $"FPS: {FPS}";
+            var monitor = DirectN.Monitor.FromWindow(TopLevelControl.Handle);
+
+            var text = $"Monitor={monitor.Bounds.Size.ToString()}; Dpi={DeviceDpi} ({(int)monitor.ScaleFactor}%); Renderer={Source.ToString()}";
+            if (UseWebview2)
+            {
+                text += $"; v{Web2.Webview2Version}";
+            }
+            else
+            {
+                text += $"; Opacity={_imageOpacity}; FPS={FPS}";
+            }
+
             var textSize = g.MeasureText(text, Font.Name, Font.Size, textDpi: DeviceDpi);
             g.DrawRectangle(0, 0, textSize.Width, textSize.Height, 0, Color.Red, Color.Black.WithAlpha(200));
             g.DrawText(text, Font.Name, Font.Size, 0f, 0f, Color.Yellow, textDpi: DeviceDpi);