Skip to content

Commit ea6bd72

Browse files
committed
Fixed Some Issues
1 parent 3516079 commit ea6bd72

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

src/HandyWinget/Bootstrapper.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
using System.Windows;
22
using HandyWinget.Common;
33
using HandyWinget.Views;
4+
using ModernWpf.Controls;
45
using Prism.DryIoc;
56
using Prism.Ioc;
6-
using Prism.Regions;
77

88
namespace HandyWinget
99
{
@@ -14,11 +14,11 @@ protected override void InitializeShell(DependencyObject shell)
1414
base.InitializeShell(shell);
1515
if (Helper.Settings.IsFirstRun)
1616
{
17-
Container.Resolve<IRegionManager>().RequestNavigate("ContentRegion", "GeneralView");
17+
MainWindow.Instance.navView.SelectedItem = MainWindow.Instance.navView.MenuItems[0] as NavigationViewItem;
1818
}
1919
else
2020
{
21-
Container.Resolve<IRegionManager>().RequestNavigate("ContentRegion", "PackageView");
21+
MainWindow.Instance.navView.SelectedItem = MainWindow.Instance.navView.MenuItems[1] as NavigationViewItem;
2222
}
2323
}
2424
protected override DependencyObject CreateShell()

src/HandyWinget/Common/HWGSettings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class HWGSettings : NotifiyingJsonSettings, IVersionable
2727
public virtual bool IdentifyInstalledPackage { get; set; } = false;
2828
public virtual bool AutoDownloadPackage { get; set; } = false;
2929
public virtual DateTime UpdatedDate { get; set; } = DateTime.Now;
30-
public virtual NavigationViewPaneDisplayMode PaneDisplayMode { get; set; } = NavigationViewPaneDisplayMode.Top;
30+
public virtual NavigationViewPaneDisplayMode PaneDisplayMode { get; set; } = NavigationViewPaneDisplayMode.Auto;
3131
public virtual InstallMode InstallMode { get; set; } = InstallMode.Internal;
3232
public virtual ApplicationTheme Theme { get; set; } = ApplicationTheme.Light;
3333
public virtual Brush Accent { get; set; }

src/HandyWinget/MainWindow.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<ui:PathIcon Data="{DynamicResource GeneralGeometry}"/>
2323
</ui:NavigationViewItem.Icon>
2424
</ui:NavigationViewItem>
25-
<ui:NavigationViewItem IsSelected="True" Tag="PackageView" Content="Packages">
25+
<ui:NavigationViewItem Tag="PackageView" Content="Packages">
2626
<ui:NavigationViewItem.Icon>
2727
<ui:PathIcon Data="{DynamicResource PackageGeometry}"/>
2828
</ui:NavigationViewItem.Icon>

src/HandyWinget/MainWindow.xaml.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,18 @@ public MainWindow(IRegionManager regionManager)
1313
InitializeComponent();
1414
_regionManager = regionManager;
1515
Instance = this;
16+
Loaded += MainWindow_Loaded;
17+
}
1618

19+
private void MainWindow_Loaded(object sender, System.Windows.RoutedEventArgs e)
20+
{
1721
LoadSettings();
1822
}
1923

2024
private void LoadSettings()
2125
{
2226
if (Settings.IsFirstRun)
2327
{
24-
navView.SelectedItem = navView.MenuItems[0];
2528
Settings.IsFirstRun = false;
2629
}
2730

0 commit comments

Comments
 (0)