feat(popup): Remember popup width and height, add option to keep on top

Author: meld-cp

src/SyncTrayzor/Pages/Settings/SettingsView.xaml

@@ -75,6 +75,7 @@
                                 <CheckBox DockPanel.Dock="Top" IsChecked="{Binding ShowDeviceOrFolderRejectedBalloons.Value}" Content="{l:Loc SettingsView_ShowDeviceOrFolderRejectedBalloons}"/>
                                 <CheckBox DockPanel.Dock="Top" IsChecked="{Binding ShowTrayIconOnlyOnClose.Value}" Content="{l:Loc SettingsView_OnlyShowTrayIconOnClose}"/>
                                 <CheckBox DockPanel.Dock="Top" IsChecked="{Binding KeepActivityPopupOpen.Value}" Content="{l:Loc SettingsView_KeepActivityPopupOpen}"/>
+                                <CheckBox DockPanel.Dock="Top" IsChecked="{Binding KeepActivityPopupOnTop.Value}" Content="{l:Loc SettingsView_KeepActivityPopupOnTop}"/>
                                 <StackPanel DockPanel.Dock="Top" Orientation="Horizontal" Margin="0,5,0,0">
                                     <Label Padding="0,0,5,0" Target="{Binding ElementName=IconAnimationModeSelect}" VerticalAlignment="Center" Content="{l:Loc SettingsView_AnimateTrayIcon}"/>
                                     <ComboBox x:Name="IconAnimationModeSelect" ItemsSource="{Binding IconAnimationModes}" SelectedValuePath="Value" SelectedValue="{Binding IconAnimationMode.Value}"/>

src/SyncTrayzor/Pages/Settings/SettingsViewModel.cs

@@ -71,6 +71,9 @@ public class SettingsViewModel : Screen
         public SettingItem<bool> ShowDeviceConnectivityBalloons { get; }
         public SettingItem<bool> ShowDeviceOrFolderRejectedBalloons { get; }
         public SettingItem<bool> KeepActivityPopupOpen { get; }
+        public SettingItem<bool> KeepActivityPopupOnTop { get; }
+        public SettingItem<int> ActivityPopupWidth { get; }
+        public SettingItem<int> ActivityPopupHeight { get; }
 
         public BindableCollection<LabelledValue<IconAnimationMode>> IconAnimationModes { get; }
         public SettingItem<IconAnimationMode> IconAnimationMode { get; }
@@ -143,6 +146,9 @@ public SettingsViewModel(
             ShowDeviceConnectivityBalloons = CreateBasicSettingItem(x => x.ShowDeviceConnectivityBalloons);
             ShowDeviceOrFolderRejectedBalloons = CreateBasicSettingItem(x => x.ShowDeviceOrFolderRejectedBalloons);
             KeepActivityPopupOpen = CreateBasicSettingItem(x => x.KeepActivityPopupOpen);
+            KeepActivityPopupOnTop = CreateBasicSettingItem(x => x.KeepActivityPopupOnTop);
+            ActivityPopupWidth = CreateBasicSettingItem(x => x.ActivityPopupWidth);
+            ActivityPopupHeight = CreateBasicSettingItem(x => x.ActivityPopupHeight );
 
             IconAnimationModes = new BindableCollection<LabelledValue<IconAnimationMode>>()
             {

src/SyncTrayzor/Pages/Tray/PopupViewModel.cs

@@ -12,9 +12,9 @@ public class PopupViewModel : Screen, IDisposable
     {
         private const int PopupOffsetX = -80;
         private readonly IConfigurationProvider configurationProvider;
-        private bool keepOpen;
         private bool isClosing;
         private Point initialPopupPosition;
+        private Configuration configuration;
 
         public FileTransfersTrayViewModel FileTransfersViewModel { get; private set; }
 
@@ -26,8 +26,7 @@ Func<FileTransfersTrayViewModel> fileTransfersViewModelFactory
             initialPopupPosition = WpfScreenHelper.MouseHelper.MousePosition; // Get initial mouse position as early as possible
 
             this.configurationProvider = configurationProvider;
-            var configuration = configurationProvider.Load();
-            keepOpen = configuration.KeepActivityPopupOpen;
+            configuration = configurationProvider.Load();
 
             FileTransfersViewModel = fileTransfersViewModelFactory();
             FileTransfersViewModel.ConductWith(this);
@@ -45,7 +44,8 @@ public void SetPopupPosition(Point popupPosition)
 
         protected override void OnActivate()
         {
-            SetViewStartPosition();
+            LoadViewSettings();
+            SetViewBounds();
             base.OnActivate();
         }
 
@@ -80,7 +80,8 @@ private void View_Closing(object sender, CancelEventArgs e)
 
         private void View_Deactivated(object sender, System.EventArgs e)
         {
-            if (keepOpen)
+            SaveViewSettings();
+            if (configuration.KeepActivityPopupOpen)
             {
                 return;
             }
@@ -91,16 +92,59 @@ private void View_Deactivated(object sender, System.EventArgs e)
             RequestClose();
         }
 
+        private void LoadViewSettings()
+        {
+            if (View is not Window w)
+            {
+                return;
+            }
+            w.ShowInTaskbar = configuration.KeepActivityPopupOpen;
+            w.Topmost = configuration.KeepActivityPopupOnTop;
+            w.Width = configuration.ActivityPopupWidth;
+            w.Height = configuration.ActivityPopupHeight;
+        }
+
+        private void SaveViewSettings()
+        {
+            if (View is not Window w)
+            {
+                return;
+            }
+
+            var viewWidth = (int)w.Width;
+            var viewHeight = (int)w.Height;
+            if (
+                viewWidth == configuration.ActivityPopupWidth
+                && viewHeight == configuration.ActivityPopupHeight
+            )
+            {
+                return;
+            }
+
+            // save view settings to config
+            configurationProvider.AtomicLoadAndSave( config =>
+            {
+                config.ActivityPopupWidth = viewWidth;
+                config.ActivityPopupHeight = viewHeight;
+            } );
+        }
+
         private void ConfigurationChanged(object sender, ConfigurationChangedEventArgs e)
         {
-            keepOpen = e.NewConfiguration.KeepActivityPopupOpen;
-            if (!keepOpen && IsActive)
+            configuration = e.NewConfiguration;
+            if (!configuration.KeepActivityPopupOpen && IsActive)
             {
                 RequestClose();
+                return;
+            }
+            if (View is not Window w)
+            {
+                return;
             }
+            w.Topmost = configuration.KeepActivityPopupOnTop;
         }
 
-        private void SetViewStartPosition()
+        private void SetViewBounds()
         {
             if (View is not Window w)
             {

src/SyncTrayzor/Properties/Resources.resx

@@ -1006,6 +1006,10 @@ Please donate to the syncthing project.</value>
     <value>Keep activity popup open</value>
     <comment>Description for checkbox in settings menu</comment>
   </data>
+  <data name="SettingsView_KeepActivityPopupOnTop" xml:space="preserve">
+    <value>Keep activity popup on top</value>
+    <comment>Description for checkbox in settings menu</comment>
+  </data>
   <data name="ConflictResolutionView_FileName_FileDeleted" xml:space="preserve">
     <value>[File Deleted]</value>
     <comment>When the base file for a conflict is not found, this placeholder is shown instead of the actual file name</comment>

src/SyncTrayzor/Services/Config/Configuration.cs

@@ -29,6 +29,9 @@ public int Version
         public bool ShowDeviceOrFolderRejectedBalloons { get; set; }
         public bool ShowSynchronizedBalloonEvenIfNothingDownloaded { get; set; }
         public bool KeepActivityPopupOpen { get; set; }
+        public bool KeepActivityPopupOnTop { get; set; }
+        public int ActivityPopupWidth { get; set; }
+        public int ActivityPopupHeight { get; set; }
         public string SyncthingAddress { get; set; }
         public bool StartSyncthingAutomatically { get; set; }
 
@@ -112,6 +115,9 @@ public Configuration()
             ShowFileInFolderCommand = "explorer.exe /select, \"{0}\"";
             LogLevel = LogLevel.Info;
             KeepActivityPopupOpen = false;
+            KeepActivityPopupOnTop = true;
+            ActivityPopupWidth = 300;
+            ActivityPopupHeight = 350;
         }
 
         public Configuration(Configuration other)
@@ -151,6 +157,9 @@ public Configuration(Configuration other)
             ShowFileInFolderCommand = other.ShowFileInFolderCommand;
             LogLevel = other.LogLevel;
             KeepActivityPopupOpen = other.KeepActivityPopupOpen;
+            KeepActivityPopupOnTop = other.KeepActivityPopupOnTop;
+            ActivityPopupWidth = other.ActivityPopupWidth;
+            ActivityPopupHeight = other.ActivityPopupHeight;
         }
 
         public override string ToString()
@@ -170,7 +179,10 @@ public override string ToString()
                 $"ConflictResolverDeletesToRecycleBin={ConflictResolverDeletesToRecycleBin} PauseDevicesOnMeteredNetworks={PauseDevicesOnMeteredNetworks} " +
                 $"HaveDonated={HaveDonated} IconAnimationMode={IconAnimationMode} OpenFolderCommand={OpenFolderCommand} ShowFileInFolderCommand={ShowFileInFolderCommand}" +
                 $"LogLevel={LogLevel}" +
-                $"KeepActivityPopupOpen={KeepActivityPopupOpen}>";
+                $"KeepActivityPopupOpen={KeepActivityPopupOpen}>" +
+                $"KeepActivityPopupOnTop={KeepActivityPopupOnTop}>" +
+                $"ActivityPopupWindowWidth={ActivityPopupWidth}>"+
+                $"ActivityPopupWindowHeight={ActivityPopupHeight}>";
         }
     }
 }