Settings window should close wile closing main window.

riyasy · Nov 10, 2023 · 61befe2 · 61befe2
1 parent 79079cd
commit 61befe2
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 13 deletions.
diff --git a/Src/FlyPhotos/App.xaml.cs b/Src/FlyPhotos/App.xaml.cs
@@ -75,7 +75,6 @@ private static SettingsData LoadSettings()
     protected override void OnLaunched(LaunchActivatedEventArgs args)
     {
         _mWindow = new PhotoDisplayWindow();
-        //_mWindow = new Settings();
         ThemeController.Instance.AddWindow(_mWindow);
         _mWindow.Activate();
     }

diff --git a/Src/FlyPhotos/Readers/WicReader.cs b/Src/FlyPhotos/Readers/WicReader.cs
@@ -23,6 +23,15 @@ internal class WicReader
 {
     private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
 
+    static WicReader()
+    {
+        CodecManager.Configure(codecs =>
+        {
+            codecs.Clear();
+            codecs.UseWicCodecs(WicCodecPolicy.All);
+        });
+    }
+
     public static async Task<(bool, Photo)> GetHq(CanvasControl ctrl, string inputPath)
     {
         try
@@ -70,11 +79,6 @@ internal class WicReader
         {
             try
             {
-                CodecManager.Configure(codecs =>
-                {
-                    codecs.Clear();
-                    codecs.UseWicCodecs(WicCodecPolicy.All);
-                });
                 using var ms = new MemoryStream();
                 MagicImageProcessor.ProcessImage(inputPath, ms, new ProcessImageSettings { Width = 200 });
                 var canvasBitmap = await CanvasBitmap.LoadAsync(ctrl, ms.AsRandomAccessStream());

diff --git a/Src/FlyPhotos/Views/PhotoDisplayWindow.xaml.cs b/Src/FlyPhotos/Views/PhotoDisplayWindow.xaml.cs
@@ -63,6 +63,7 @@ public PhotoDisplayWindow()
         TxtFileName.Text = Path.GetFileName(App.SelectedFileName);
 
         _appWindow.Changed += AppWindow_Changed;
+        Closed += PhotoDisplayWindow_Closed;
         D2dCanvas.CreateResources += D2dCanvas_CreateResources;
         D2dCanvas.PointerReleased += D2dCanvas_PointerReleased;
         MainLayout.KeyDown += HandleKeyDown;
@@ -210,19 +211,27 @@ private void ButtonSettings_OnClick(object sender, RoutedEventArgs e)
             _settingWindow = new Settings();
             _settingWindow.SetWindowSize(1024, 768);
             ThemeController.Instance.AddWindow(_settingWindow);
-            _settingWindow.Closed += _settingWindow_Closed;
+            _settingWindow.Closed += SettingWindow_Closed;
         }
 
         _settingWindow.Activate();
     }
 
-    private void _settingWindow_Closed(object sender, WindowEventArgs args)
+    private void SettingWindow_Closed(object sender, WindowEventArgs args)
     {
         if (_settingWindow != null)
-            _settingWindow.Closed -= _settingWindow_Closed;
+            _settingWindow.Closed -= SettingWindow_Closed;
         _settingWindow = null;
     }
 
+    private void PhotoDisplayWindow_Closed(object sender, WindowEventArgs args)
+    {
+        if (_settingWindow != null)
+        {
+            _settingWindow.Close();
+        }
+    }
+
     private void ButtonCoffee_OnClick(object sender, RoutedEventArgs e)
     {
     }

diff --git a/Src/FlyPhotosInstaller/FlyPhotosInstaller.vdproj b/Src/FlyPhotosInstaller/FlyPhotosInstaller.vdproj
@@ -27,6 +27,12 @@
         }
         "Entry"
         {
+        "MsmKey" = "8:_0ED0A0697EED43989809FE1753745269"
+        "OwnerKey" = "8:_UNDEFINED"
+        "MsmSig" = "8:_UNDEFINED"
+        }
+        "Entry"
+        {
         "MsmKey" = "8:_31A5BD4899C24096B0BE30F0EAF817D3"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
@@ -286,6 +292,26 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0ED0A0697EED43989809FE1753745269"
+            {
+            "SourcePath" = "8:..\\FlyPhotos\\Assets\\Images\\github-mark.png"
+            "TargetName" = "8:github-mark.png"
+            "Tag" = "8:"
+            "Folder" = "8:_752CA1FDE6254AB8B0E85E88E0147DAF"
+            "Condition" = "8:"
+            "Transitive" = "11:FALSE"
+            "Vital" = "11:TRUE"
+            "ReadOnly" = "11:FALSE"
+            "Hidden" = "11:FALSE"
+            "System" = "11:FALSE"
+            "Permanent" = "11:FALSE"
+            "SharedLegacy" = "11:FALSE"
+            "PackageAs" = "3:1"
+            "Register" = "3:1"
+            "Exclude" = "11:FALSE"
+            "IsDependency" = "11:FALSE"
+            "IsolateTo" = "8:"
+            }
             "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_31A5BD4899C24096B0BE30F0EAF817D3"
             {
             "SourcePath" = "8:..\\FlyPhotos\\Assets\\Images\\HQImageFailed.png"
@@ -835,15 +861,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Fly"
-        "ProductCode" = "8:{03D62E5E-D860-4277-9526-7AF9FCDA8666}"
-        "PackageCode" = "8:{986D6EFE-6AE6-4F66-9CEA-A02A046168C7}"
+        "ProductCode" = "8:{8819C3D6-0ADB-4092-8EDA-EF709319668E}"
+        "PackageCode" = "8:{9C4DBEA7-95F8-4102-A139-F6591A4AE0B1}"
         "UpgradeCode" = "8:{5565DCCD-EEED-45A0-93FF-4BABC468C2A7}"
         "AspNetVersion" = "8:"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:2.0.0"
+        "ProductVersion" = "8:2.1.0"
         "Manufacturer" = "8:RYFTools"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:https://github.com/riyasy/FlyPhotos"
@@ -1421,7 +1447,7 @@
         {
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_09545E601968474C8570943A828095CA"
             {
-            "SourcePath" = "8:..\\FlyPhotos\\obj\\x64\\Release\\net6.0-windows10.0.22621.0\\win-x64\\apphost.exe"
+            "SourcePath" = "8:..\\FlyPhotos\\obj\\x64\\Release\\net8.0-windows10.0.22621.0\\win-x64\\apphost.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_B39DF84F3AED4B16BF16389409AB1549"