chore: modify open image logic.

ghost1372 · Jan 17, 2023 · 689d5e7 · 689d5e7
1 parent 456390b
commit 689d5e7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/Shared/HandyControl_Shared/Controls/Image/ImageViewer.cs b/src/Shared/HandyControl_Shared/Controls/Image/ImageViewer.cs
@@ -166,6 +166,8 @@ public class ImageViewer : Control
 
     private MouseBinding _mouseMoveBinding;
 
+    private ImageBrowser _imageBrowser;
+
     #endregion Data
 
     #region ctor
@@ -588,13 +590,11 @@ private void ButtonSave_OnClick(object sender, RoutedEventArgs e)
 
     private void ButtonWindowsOpen_OnClick(object sender, RoutedEventArgs e)
     {
-        try
-        {
-            Process.Start(ImgPath);
-        }
-        catch (Exception exception)
+        if (Uri is { } uri)
         {
-            MessageBox.Show(exception.Message);
+            _imageBrowser?.Close();
+            _imageBrowser = new ImageBrowser(uri);
+            _imageBrowser.Show();
         }
     }
 

diff --git a/src/Shared/HandyControl_Shared/Controls/Window/ImageBrowser.cs b/src/Shared/HandyControl_Shared/Controls/Window/ImageBrowser.cs
@@ -43,6 +43,7 @@ public ImageBrowser()
 
         WindowStartupLocation = WindowStartupLocation.CenterScreen;
         WindowStyle = WindowStyle.None;
+        Topmost = true;
         AllowsTransparency = true;
     }