Improvement: now main window is not topmost

fomgleb · Aug 7, 2022 · be91151 · be91151
1 parent 0c9fe38
commit be91151
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/WallpapersSlideshower/Commands/ChangeWindowVisibilityCommand.cs b/WallpapersSlideshower/Commands/ChangeWindowVisibilityCommand.cs
@@ -22,6 +22,11 @@ public override void Execute(object? parameter)
             if (parameter == null) throw new ArgumentNullException(nameof(parameter), "Argument can't be null.");
             var enableVisibility = (bool)parameter;
             _mainWindowViewModel.WindowVisibility = enableVisibility;
+            if (enableVisibility)
+            {
+                _mainWindowViewModel.Topmost = true;
+                _mainWindowViewModel.Topmost = false;
+            }
         }
     }
 }
diff --git a/WallpapersSlideshower/ViewModels/MainWindowViewModel.cs b/WallpapersSlideshower/ViewModels/MainWindowViewModel.cs
@@ -39,6 +39,9 @@ public class MainWindowViewModel : ViewModelBase
         public bool AutorunIsEnabled { get => _autorunIsEnabled; set => Set(ref _autorunIsEnabled, value); }
         private bool _autorunIsEnabled;
 
+        public bool Topmost { get => _topmost; set => Set(ref _topmost, value); }
+        private bool _topmost;
+
         public WindowState WindowStateBeforeHide { get; set; }
 
         public ICommand SelectFolderCommand { get; }

diff --git a/WallpapersSlideshower/Views/MainWindow.xaml b/WallpapersSlideshower/Views/MainWindow.xaml
@@ -14,7 +14,7 @@
         Title="Wallpapers Slideshower" Height="500" Width="1048"
         Icon="/Resources/Icons/wallpaper-svgrepo-com.ico"
         WindowState="{Binding WindowState, Mode=TwoWay}"
-        Topmost="True">
+        Topmost="{Binding Topmost}">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>

diff --git a/WallpapersSlideshower/WallpapersSlideshower.csproj b/WallpapersSlideshower/WallpapersSlideshower.csproj
@@ -5,7 +5,7 @@
     <TargetFramework>net6.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
-	<Version>1.4.2</Version>
+	<Version>1.4.3</Version>
   </PropertyGroup>
 
   <ItemGroup>