Show window when minimized

Ruben2776 · Ruben2776 · commit 320719ed3407 · 2025-01-10T18:38:51.000+01:00
diff --git a/src/PicView.Avalonia.MacOS/App.axaml.cs b/src/PicView.Avalonia.MacOS/App.axaml.cs
@@ -12,6 +12,7 @@
 using PicView.Avalonia.StartUp;
 using PicView.Avalonia.UI;
 using PicView.Avalonia.ViewModels;
+using PicView.Avalonia.WindowBehavior;
 using PicView.Core.Config;
 using PicView.Core.FileHandling;
 using PicView.Core.Localization;
@@ -148,7 +149,14 @@ void Set()
             }
             else
             {
-                _aboutWindow.Activate();
+                if (_aboutWindow.WindowState == WindowState.Minimized)
+                {
+                    WindowFunctions.ShowMinimizedWindow(_aboutWindow);
+                }
+                else
+                {
+                    _aboutWindow.Show();
+                }       
             }
 
             _ = FunctionsHelper.CloseMenus();
@@ -186,7 +194,14 @@ void Set()
             }
             else
             {
-                _exifWindow.Activate();
+                if (_exifWindow.WindowState == WindowState.Minimized)
+                {
+                    WindowFunctions.ShowMinimizedWindow(_exifWindow);
+                }
+                else
+                {
+                    _exifWindow.Show();
+                }      
             }
 
             _ = FunctionsHelper.CloseMenus();
@@ -224,7 +239,14 @@ void Set()
             }
             else
             {
-                _keybindingsWindow.Activate();
+                if (_keybindingsWindow.WindowState == WindowState.Minimized)
+                {
+                    WindowFunctions.ShowMinimizedWindow(_keybindingsWindow);
+                }
+                else
+                {
+                    _keybindingsWindow.Show();
+                }      
             }
 
             _ = FunctionsHelper.CloseMenus();
@@ -260,7 +282,14 @@ void Set()
             }
             else
             {
-                _settingsWindow.Activate();
+                if (_settingsWindow.WindowState == WindowState.Minimized)
+                {
+                    WindowFunctions.ShowMinimizedWindow(_settingsWindow);
+                }
+                else
+                {
+                    _settingsWindow.Show();
+                }     
             }
             _= FunctionsHelper.CloseMenus();
             
@@ -296,7 +325,14 @@ void Set()
             }
             else
             {
-                _effectsWindow.Activate();
+                if (_effectsWindow.WindowState == WindowState.Minimized)
+                {
+                    WindowFunctions.ShowMinimizedWindow(_effectsWindow);
+                }
+                else
+                {
+                    _effectsWindow.Show();
+                }   
             }
             _= FunctionsHelper.CloseMenus();
         }
@@ -331,7 +367,14 @@ void Set()
             }
             else
             {
-                _singleImageResizeWindow.Activate();
+                if (_singleImageResizeWindow.WindowState == WindowState.Minimized)
+                {
+                    WindowFunctions.ShowMinimizedWindow(_singleImageResizeWindow);
+                }
+                else
+                {
+                    _singleImageResizeWindow.Show();
+                }  
             }
             _= FunctionsHelper.CloseMenus();
         }
@@ -366,7 +409,14 @@ void Set()
             }
             else
             {
-                _batchResizeWindow.Activate();
+                if (_batchResizeWindow.WindowState == WindowState.Minimized)
+                {
+                    WindowFunctions.ShowMinimizedWindow(_batchResizeWindow);
+                }
+                else
+                {
+                    _batchResizeWindow.Show();
+                }  
             }
             _= FunctionsHelper.CloseMenus();
         }   
diff --git a/src/PicView.Avalonia.Win32/App.axaml.cs b/src/PicView.Avalonia.Win32/App.axaml.cs
@@ -13,6 +13,7 @@
 using PicView.Avalonia.UI;
 using PicView.Avalonia.ViewModels;
 using PicView.Avalonia.Win32.Views;
+using PicView.Avalonia.WindowBehavior;
 using PicView.Core.Config;
 using PicView.Core.FileHandling;
 using PicView.Core.Localization;
@@ -191,7 +192,14 @@ void Set()
             }
             else
             {
-                _aboutWindow.Activate();
+                if (_aboutWindow.WindowState == WindowState.Minimized)
+                {
+                    WindowFunctions.ShowMinimizedWindow(_aboutWindow);
+                }
+                else
+                {
+                    _aboutWindow.Show();
+                }       
             }
 
             _ = FunctionsHelper.CloseMenus();
@@ -229,7 +237,14 @@ void Set()
             }
             else
             {
-                _exifWindow.Activate();
+                if (_exifWindow.WindowState == WindowState.Minimized)
+                {
+                    WindowFunctions.ShowMinimizedWindow(_exifWindow);
+                }
+                else
+                {
+                    _exifWindow.Show();
+                }       
             }
 
             _ = FunctionsHelper.CloseMenus();
@@ -267,7 +282,14 @@ void Set()
             }
             else
             {
-                _keybindingsWindow.Activate();
+                if (_keybindingsWindow.WindowState == WindowState.Minimized)
+                {
+                    WindowFunctions.ShowMinimizedWindow(_keybindingsWindow);
+                }
+                else
+                {
+                    _keybindingsWindow.Show();
+                }       
             }
 
             _ = FunctionsHelper.CloseMenus();
@@ -303,7 +325,14 @@ void Set()
             }
             else
             {
-                _settingsWindow.Activate();
+                if (_settingsWindow.WindowState == WindowState.Minimized)
+                {
+                    WindowFunctions.ShowMinimizedWindow(_settingsWindow);
+                }
+                else
+                {
+                    _settingsWindow.Show();
+                }         
             }
             _= FunctionsHelper.CloseMenus();
             
@@ -339,7 +368,14 @@ void Set()
             }
             else
             {
-                _singleImageResizeWindow.Activate();                
+                if (_singleImageResizeWindow.WindowState == WindowState.Minimized)
+                {
+                    WindowFunctions.ShowMinimizedWindow(_singleImageResizeWindow);
+                }
+                else
+                {
+                    _singleImageResizeWindow.Show();
+                }         
             }
             _= FunctionsHelper.CloseMenus();
         }
@@ -374,7 +410,14 @@ void Set()
             }
             else
             {
-                _batchResizeWindow.Show();
+                if (_batchResizeWindow.WindowState == WindowState.Minimized)
+                {
+                    WindowFunctions.ShowMinimizedWindow(_batchResizeWindow);
+                }
+                else
+                {
+                    _batchResizeWindow.Show();
+                }
             }
             _= FunctionsHelper.CloseMenus();
         }   
@@ -409,7 +452,14 @@ void Set()
             }
             else
             {
-                _effectsWindow.Show();
+                if (_effectsWindow.WindowState == WindowState.Minimized)
+                {
+                    WindowFunctions.ShowMinimizedWindow(_effectsWindow);
+                }
+                else
+                {
+                    _effectsWindow.Show();
+                }
             }
             _= FunctionsHelper.CloseMenus();
         }
diff --git a/src/PicView.Avalonia/WindowBehavior/WindowFunctions.cs b/src/PicView.Avalonia/WindowBehavior/WindowFunctions.cs
@@ -66,7 +66,15 @@ public static async Task WindowClosingBehavior(Window window)
         Environment.Exit(0);
     }
 
-    #region Window State Management
+    #region Window State
+
+    public static void ShowMinimizedWindow(Window window)
+    {
+        window.BringIntoView();
+        window.WindowState = WindowState.Normal;
+        window.Activate();
+        window.Focus();
+    }
 
     public static async Task ToggleTopMost(MainViewModel vm)
     {

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`using PicView.Avalonia.StartUp;`
`13`	`13`	`using PicView.Avalonia.UI;`
`14`	`14`	`using PicView.Avalonia.ViewModels;`
	`15`	`+using PicView.Avalonia.WindowBehavior;`
`15`	`16`	`using PicView.Core.Config;`
`16`	`17`	`using PicView.Core.FileHandling;`
`17`	`18`	`using PicView.Core.Localization;`
`@@ -148,7 +149,14 @@ void Set()`
`148`	`149`	`}`
`149`	`150`	`else`
`150`	`151`	`{`
`151`		`- _aboutWindow.Activate();`
	`152`	`+ if (_aboutWindow.WindowState == WindowState.Minimized)`
	`153`	`+ {`
	`154`	`+ WindowFunctions.ShowMinimizedWindow(_aboutWindow);`
	`155`	`+ }`
	`156`	`+ else`
	`157`	`+ {`
	`158`	`+ _aboutWindow.Show();`
	`159`	`+ }`
`152`	`160`	`}`
`153`	`161`
`154`	`162`	`_ = FunctionsHelper.CloseMenus();`
`@@ -186,7 +194,14 @@ void Set()`
`186`	`194`	`}`
`187`	`195`	`else`
`188`	`196`	`{`
`189`		`- _exifWindow.Activate();`
	`197`	`+ if (_exifWindow.WindowState == WindowState.Minimized)`
	`198`	`+ {`
	`199`	`+ WindowFunctions.ShowMinimizedWindow(_exifWindow);`
	`200`	`+ }`
	`201`	`+ else`
	`202`	`+ {`
	`203`	`+ _exifWindow.Show();`
	`204`	`+ }`
`190`	`205`	`}`
`191`	`206`
`192`	`207`	`_ = FunctionsHelper.CloseMenus();`
`@@ -224,7 +239,14 @@ void Set()`
`224`	`239`	`}`
`225`	`240`	`else`
`226`	`241`	`{`
`227`		`- _keybindingsWindow.Activate();`
	`242`	`+ if (_keybindingsWindow.WindowState == WindowState.Minimized)`
	`243`	`+ {`
	`244`	`+ WindowFunctions.ShowMinimizedWindow(_keybindingsWindow);`
	`245`	`+ }`
	`246`	`+ else`
	`247`	`+ {`
	`248`	`+ _keybindingsWindow.Show();`
	`249`	`+ }`
`228`	`250`	`}`
`229`	`251`
`230`	`252`	`_ = FunctionsHelper.CloseMenus();`
`@@ -260,7 +282,14 @@ void Set()`
`260`	`282`	`}`
`261`	`283`	`else`
`262`	`284`	`{`
`263`		`- _settingsWindow.Activate();`
	`285`	`+ if (_settingsWindow.WindowState == WindowState.Minimized)`
	`286`	`+ {`
	`287`	`+ WindowFunctions.ShowMinimizedWindow(_settingsWindow);`
	`288`	`+ }`
	`289`	`+ else`
	`290`	`+ {`
	`291`	`+ _settingsWindow.Show();`
	`292`	`+ }`
`264`	`293`	`}`
`265`	`294`	`_= FunctionsHelper.CloseMenus();`
`266`	`295`
`@@ -296,7 +325,14 @@ void Set()`
`296`	`325`	`}`
`297`	`326`	`else`
`298`	`327`	`{`
`299`		`- _effectsWindow.Activate();`
	`328`	`+ if (_effectsWindow.WindowState == WindowState.Minimized)`
	`329`	`+ {`
	`330`	`+ WindowFunctions.ShowMinimizedWindow(_effectsWindow);`
	`331`	`+ }`
	`332`	`+ else`
	`333`	`+ {`
	`334`	`+ _effectsWindow.Show();`
	`335`	`+ }`
`300`	`336`	`}`
`301`	`337`	`_= FunctionsHelper.CloseMenus();`
`302`	`338`	`}`
`@@ -331,7 +367,14 @@ void Set()`
`331`	`367`	`}`
`332`	`368`	`else`
`333`	`369`	`{`
`334`		`- _singleImageResizeWindow.Activate();`
	`370`	`+ if (_singleImageResizeWindow.WindowState == WindowState.Minimized)`
	`371`	`+ {`
	`372`	`+ WindowFunctions.ShowMinimizedWindow(_singleImageResizeWindow);`
	`373`	`+ }`
	`374`	`+ else`
	`375`	`+ {`
	`376`	`+ _singleImageResizeWindow.Show();`
	`377`	`+ }`
`335`	`378`	`}`
`336`	`379`	`_= FunctionsHelper.CloseMenus();`
`337`	`380`	`}`
`@@ -366,7 +409,14 @@ void Set()`
`366`	`409`	`}`
`367`	`410`	`else`
`368`	`411`	`{`
`369`		`- _batchResizeWindow.Activate();`
	`412`	`+ if (_batchResizeWindow.WindowState == WindowState.Minimized)`
	`413`	`+ {`
	`414`	`+ WindowFunctions.ShowMinimizedWindow(_batchResizeWindow);`
	`415`	`+ }`
	`416`	`+ else`
	`417`	`+ {`
	`418`	`+ _batchResizeWindow.Show();`
	`419`	`+ }`
`370`	`420`	`}`
`371`	`421`	`_= FunctionsHelper.CloseMenus();`
`372`	`422`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`using PicView.Avalonia.UI;`
`14`	`14`	`using PicView.Avalonia.ViewModels;`
`15`	`15`	`using PicView.Avalonia.Win32.Views;`
	`16`	`+using PicView.Avalonia.WindowBehavior;`
`16`	`17`	`using PicView.Core.Config;`
`17`	`18`	`using PicView.Core.FileHandling;`
`18`	`19`	`using PicView.Core.Localization;`
`@@ -191,7 +192,14 @@ void Set()`
`191`	`192`	`}`
`192`	`193`	`else`
`193`	`194`	`{`
`194`		`- _aboutWindow.Activate();`
	`195`	`+ if (_aboutWindow.WindowState == WindowState.Minimized)`
	`196`	`+ {`
	`197`	`+ WindowFunctions.ShowMinimizedWindow(_aboutWindow);`
	`198`	`+ }`
	`199`	`+ else`
	`200`	`+ {`
	`201`	`+ _aboutWindow.Show();`
	`202`	`+ }`
`195`	`203`	`}`
`196`	`204`
`197`	`205`	`_ = FunctionsHelper.CloseMenus();`
`@@ -229,7 +237,14 @@ void Set()`
`229`	`237`	`}`
`230`	`238`	`else`
`231`	`239`	`{`
`232`		`- _exifWindow.Activate();`
	`240`	`+ if (_exifWindow.WindowState == WindowState.Minimized)`
	`241`	`+ {`
	`242`	`+ WindowFunctions.ShowMinimizedWindow(_exifWindow);`
	`243`	`+ }`
	`244`	`+ else`
	`245`	`+ {`
	`246`	`+ _exifWindow.Show();`
	`247`	`+ }`
`233`	`248`	`}`
`234`	`249`
`235`	`250`	`_ = FunctionsHelper.CloseMenus();`
`@@ -267,7 +282,14 @@ void Set()`
`267`	`282`	`}`
`268`	`283`	`else`
`269`	`284`	`{`
`270`		`- _keybindingsWindow.Activate();`
	`285`	`+ if (_keybindingsWindow.WindowState == WindowState.Minimized)`
	`286`	`+ {`
	`287`	`+ WindowFunctions.ShowMinimizedWindow(_keybindingsWindow);`
	`288`	`+ }`
	`289`	`+ else`
	`290`	`+ {`
	`291`	`+ _keybindingsWindow.Show();`
	`292`	`+ }`
`271`	`293`	`}`
`272`	`294`
`273`	`295`	`_ = FunctionsHelper.CloseMenus();`
`@@ -303,7 +325,14 @@ void Set()`
`303`	`325`	`}`
`304`	`326`	`else`
`305`	`327`	`{`
`306`		`- _settingsWindow.Activate();`
	`328`	`+ if (_settingsWindow.WindowState == WindowState.Minimized)`
	`329`	`+ {`
	`330`	`+ WindowFunctions.ShowMinimizedWindow(_settingsWindow);`
	`331`	`+ }`
	`332`	`+ else`
	`333`	`+ {`
	`334`	`+ _settingsWindow.Show();`
	`335`	`+ }`
`307`	`336`	`}`
`308`	`337`	`_= FunctionsHelper.CloseMenus();`
`309`	`338`
`@@ -339,7 +368,14 @@ void Set()`
`339`	`368`	`}`
`340`	`369`	`else`
`341`	`370`	`{`
`342`		`- _singleImageResizeWindow.Activate();`
	`371`	`+ if (_singleImageResizeWindow.WindowState == WindowState.Minimized)`
	`372`	`+ {`
	`373`	`+ WindowFunctions.ShowMinimizedWindow(_singleImageResizeWindow);`
	`374`	`+ }`
	`375`	`+ else`
	`376`	`+ {`
	`377`	`+ _singleImageResizeWindow.Show();`
	`378`	`+ }`
`343`	`379`	`}`
`344`	`380`	`_= FunctionsHelper.CloseMenus();`
`345`	`381`	`}`
`@@ -374,7 +410,14 @@ void Set()`
`374`	`410`	`}`
`375`	`411`	`else`
`376`	`412`	`{`
`377`		`- _batchResizeWindow.Show();`
	`413`	`+ if (_batchResizeWindow.WindowState == WindowState.Minimized)`
	`414`	`+ {`
	`415`	`+ WindowFunctions.ShowMinimizedWindow(_batchResizeWindow);`
	`416`	`+ }`
	`417`	`+ else`
	`418`	`+ {`
	`419`	`+ _batchResizeWindow.Show();`
	`420`	`+ }`
`378`	`421`	`}`
`379`	`422`	`_= FunctionsHelper.CloseMenus();`
`380`	`423`	`}`
`@@ -409,7 +452,14 @@ void Set()`
`409`	`452`	`}`
`410`	`453`	`else`
`411`	`454`	`{`
`412`		`- _effectsWindow.Show();`
	`455`	`+ if (_effectsWindow.WindowState == WindowState.Minimized)`
	`456`	`+ {`
	`457`	`+ WindowFunctions.ShowMinimizedWindow(_effectsWindow);`
	`458`	`+ }`
	`459`	`+ else`
	`460`	`+ {`
	`461`	`+ _effectsWindow.Show();`
	`462`	`+ }`
`413`	`463`	`}`
`414`	`464`	`_= FunctionsHelper.CloseMenus();`
`415`	`465`	`}`