Fix NavogationButton close method

kysect · Jan 12, 2019 · 5554751 · 5554751
1 parent 0325b58
commit 5554751
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/LimpStats.Client/CustomControls/NavigateButton.xaml.cs b/LimpStats.Client/CustomControls/NavigateButton.xaml.cs
@@ -7,21 +7,21 @@ namespace LimpStats.Client.CustomControls
     public partial class NavigateButton : UserControl
     {
         private readonly IViewNavigateService _navigateService;
-        private readonly UserControl _currentControl;
+        public readonly UserControl CurrentControl;
 
         public NavigateButton(string viewName, IViewNavigateService navigateService, UserControl block)
         {
             InitializeComponent();
 
             _navigateService = navigateService;
-            _currentControl = block;
+            CurrentControl = block;
 
             OpenViewButton.DataContext = viewName;
         }
 
         private void ShowUserControl(object sender, RoutedEventArgs e)
         {
-            _navigateService.OpenView(_currentControl);
+            _navigateService.OpenView(CurrentControl);
         }
 
         private void RemoveFromListButton(object sender, RoutedEventArgs e)

diff --git a/LimpStats.Client/MainWindow.xaml.cs b/LimpStats.Client/MainWindow.xaml.cs
@@ -21,6 +21,10 @@ public MainWindow()
         public void RemoveButton(NavigateButton button)
         {
             NavigatePanel.Children.Remove(button);
+            if (MainWindowContent.Content == button.CurrentControl.Content)
+            {
+                MainWindowContent.Visibility = Visibility.Hidden;
+            }
             //TODO: implement closing content window
         }
 
@@ -31,6 +35,7 @@ public void AddToViewList(string viewTitle, UserControl view)
 
         public void OpenView(UserControl view)
         {
+            MainWindowContent.Visibility = Visibility.Visible;
             MainWindowContent.Content = view.Content;
         }