Don't hide the app initially if a dialog is active

Tyrrrz · Apr 23, 2024 · fc8a8e5 · fc8a8e5
1 parent 98dee7e
commit fc8a8e5
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/LightBulb/Services/UpdateService.cs b/LightBulb/Services/UpdateService.cs
@@ -25,6 +25,9 @@ public class UpdateService(SettingsService settingsService) : IDisposable
 
     public Version? TryGetLastPreparedUpdate()
     {
+        if (!settingsService.IsAutoUpdateEnabled)
+            return null;
+
         var version = _updateManager.GetPreparedUpdates().Max();
         if (version <= _updateManager.Updatee.Version)
             return null;

diff --git a/LightBulb/Views/MainView.axaml b/LightBulb/Views/MainView.axaml
@@ -22,7 +22,10 @@
     </Design.DataContext>
 
     <Border BorderBrush="{DynamicResource MaterialPrimaryLightBrush}" BorderThickness="1">
-        <dialogHostAvalonia:DialogHost CloseOnClickAway="False">
+        <dialogHostAvalonia:DialogHost
+            x:Name="DialogHost"
+            CloseOnClickAway="False"
+            Loaded="DialogHost_OnLoaded">
             <Grid RowDefinitions="Auto,*,Auto">
                 <!--  Header  -->
                 <Border

diff --git a/LightBulb/Views/MainView.axaml.cs b/LightBulb/Views/MainView.axaml.cs
@@ -12,10 +12,9 @@ public partial class MainView : Window<MainViewModel>
 
     private void Window_OnLoaded(object sender, RoutedEventArgs args)
     {
-        if (StartOptions.Current.IsInitiallyHidden)
+        // If the app is set to start hidden, hide the window, unless a dialog is open
+        if (StartOptions.Current.IsInitiallyHidden && !DialogHost.IsOpen)
             Hide();
-
-        DataContext.InitializeCommand.Execute(null);
     }
 
     private void Window_OnClosing(object sender, WindowClosingEventArgs args)
@@ -24,6 +23,9 @@ private void Window_OnClosing(object sender, WindowClosingEventArgs args)
         Hide();
     }
 
+    private void DialogHost_OnLoaded(object? sender, RoutedEventArgs args) =>
+        DataContext.InitializeCommand.Execute(null);
+
     private void HeaderBorder_OnPointerPressed(object? sender, PointerPressedEventArgs args) =>
         BeginMoveDrag(args);