Fixed Some Issues

HandyOrg · Jun 16, 2021 · ea6bd72 · ea6bd72
1 parent 3516079
commit ea6bd72
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/src/HandyWinget/Bootstrapper.cs b/src/HandyWinget/Bootstrapper.cs
@@ -1,9 +1,9 @@
 using System.Windows;
 using HandyWinget.Common;
 using HandyWinget.Views;
+using ModernWpf.Controls;
 using Prism.DryIoc;
 using Prism.Ioc;
-using Prism.Regions;
 
 namespace HandyWinget
 {
@@ -14,11 +14,11 @@ protected override void InitializeShell(DependencyObject shell)
             base.InitializeShell(shell);
             if (Helper.Settings.IsFirstRun)
             {
-                Container.Resolve<IRegionManager>().RequestNavigate("ContentRegion", "GeneralView");
+                MainWindow.Instance.navView.SelectedItem = MainWindow.Instance.navView.MenuItems[0] as NavigationViewItem;
             }
             else
             {
-                Container.Resolve<IRegionManager>().RequestNavigate("ContentRegion", "PackageView");
+                MainWindow.Instance.navView.SelectedItem = MainWindow.Instance.navView.MenuItems[1] as NavigationViewItem;
             }
         }
         protected override DependencyObject CreateShell()

diff --git a/src/HandyWinget/Common/HWGSettings.cs b/src/HandyWinget/Common/HWGSettings.cs
@@ -27,7 +27,7 @@ public class HWGSettings : NotifiyingJsonSettings, IVersionable
         public virtual bool IdentifyInstalledPackage { get; set; } = false;
         public virtual bool AutoDownloadPackage { get; set; } = false;
         public virtual DateTime UpdatedDate { get; set; } = DateTime.Now;
-        public virtual NavigationViewPaneDisplayMode PaneDisplayMode { get; set; } = NavigationViewPaneDisplayMode.Top;
+        public virtual NavigationViewPaneDisplayMode PaneDisplayMode { get; set; } = NavigationViewPaneDisplayMode.Auto;
         public virtual InstallMode InstallMode { get; set; } = InstallMode.Internal;
         public virtual ApplicationTheme Theme { get; set; } = ApplicationTheme.Light;
         public virtual Brush Accent { get; set; }

diff --git a/src/HandyWinget/MainWindow.xaml b/src/HandyWinget/MainWindow.xaml
@@ -22,7 +22,7 @@
                     <ui:PathIcon Data="{DynamicResource GeneralGeometry}"/>
                 </ui:NavigationViewItem.Icon>
             </ui:NavigationViewItem>
-            <ui:NavigationViewItem IsSelected="True" Tag="PackageView" Content="Packages">
+            <ui:NavigationViewItem Tag="PackageView" Content="Packages">
                 <ui:NavigationViewItem.Icon>
                     <ui:PathIcon Data="{DynamicResource PackageGeometry}"/>
                 </ui:NavigationViewItem.Icon>

diff --git a/src/HandyWinget/MainWindow.xaml.cs b/src/HandyWinget/MainWindow.xaml.cs
@@ -13,15 +13,18 @@ public MainWindow(IRegionManager regionManager)
             InitializeComponent();
             _regionManager = regionManager;
             Instance = this;
+            Loaded += MainWindow_Loaded;
+        }
 
+        private void MainWindow_Loaded(object sender, System.Windows.RoutedEventArgs e)
+        {
             LoadSettings();
         }
 
         private void LoadSettings()
         {
             if (Settings.IsFirstRun)
             {
-                navView.SelectedItem = navView.MenuItems[0];
                 Settings.IsFirstRun = false;
             }