Skip to content

Commit 7389462

Browse files
committed
External initialization of ViewModel (code cleanup)
1 parent 1159996 commit 7389462

2 files changed

Lines changed: 5 additions & 7 deletions

File tree

Src/ScreenGrid/App.xaml.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ protected override void OnStartup(StartupEventArgs e)
1616
base.OnStartup(e);
1717
this.DispatcherUnhandledException += AppDispatcherUnhandledException;
1818

19-
(new ScreenGrid.Views.ScreenGridWindow()).Show();
19+
(new Views.ScreenGridWindow
20+
{
21+
DataContext = new ViewModels.ScreenGridViewModel()
22+
}).Show();
2023
}
2124

2225
private void CurrentDomainUnhandledException(object sender, UnhandledExceptionEventArgs e)

Src/ScreenGrid/Views/ScreenGridWindow.xaml.cs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,11 @@ public ScreenGridWindow()
2121
// Making text sharp
2222
TextOptions.SetTextFormattingMode(this, TextFormattingMode.Display);
2323

24-
// TODO: external ViewModel
2524
this.InitializeComponent();
26-
this.vm = new ViewModels.ScreenGridViewModel();
27-
this.DataContext = this.vm;
2825
}
2926

3027
private ContextMenu mainMenu;
3128

32-
private ViewModels.ScreenGridViewModel vm;
33-
3429
private void Window_Loaded(object sender, RoutedEventArgs e)
3530
{
3631
this.CreateContextMenu();
@@ -75,7 +70,7 @@ private void CreateContextMenu()
7570
}
7671

7772
menuItem.IsChecked = true;
78-
this.vm.GridMode = (Models.Grids.GridType)((s as MenuItem).Tag);
73+
(this.DataContext as ViewModels.ScreenGridViewModel).GridMode = (Models.Grids.GridType)((s as MenuItem).Tag);
7974
};
8075

8176
this.mainMenu.Items.Add(menuItem);

0 commit comments

Comments
 (0)