#137 Fix proxy tab unselection.

MonkAlex · Jun 12, 2019 · 57edd1c · 57edd1c
1 parent bb280da
commit 57edd1c
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 22 deletions.
diff --git a/MangaReader.Avalonia/App.xaml b/MangaReader.Avalonia/App.xaml
@@ -2,5 +2,8 @@
   <Application.Styles>
     <StyleInclude Source="resm:Avalonia.Themes.Default.DefaultTheme.xaml?assembly=Avalonia.Themes.Default"/>
     <StyleInclude Source="resm:Avalonia.Themes.Default.Accents.BaseLight.xaml?assembly=Avalonia.Themes.Default"/>
+    <Style Selector="Button">
+      <Setter Property="MinWidth" Value="72"/>
+    </Style>
   </Application.Styles>
 </Application>
diff --git a/MangaReader.Avalonia/View/ProxySetting.xaml b/MangaReader.Avalonia/View/ProxySetting.xaml
@@ -2,7 +2,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:view="clr-namespace:MangaReader.Avalonia.View;assemlby=MangaReader.Avalonia"
+             xmlns:view="clr-namespace:MangaReader.Avalonia.View;assembly=MangaReader.Avalonia"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="MangaReader.Avalonia.View.ProxySetting">
   <StackPanel Margin="10">

diff --git a/MangaReader.Avalonia/ViewModel/Explorer/MangaSettingsViewModel.cs b/MangaReader.Avalonia/ViewModel/Explorer/MangaSettingsViewModel.cs
@@ -11,7 +11,7 @@
 
 namespace MangaReader.Avalonia.ViewModel.Explorer
 {
-  public class MangaSettingsViewModel : ExplorerTabViewModel
+  public class MangaSettingsViewModel : SettingTabViewModel
   {
     private readonly int mangaSettingsId;
 
@@ -66,17 +66,7 @@ public Compression.CompressionMode Compression
     }
 
     private Compression.CompressionMode compression;
-
-    public override async Task OnUnselected(ExplorerTabViewModel newModel)
-    {
-      await base.OnUnselected(newModel).ConfigureAwait(true);
-      if (!(newModel is SettingsViewModel || newModel is MangaSettingsViewModel || newModel is ProxySettingSelectorModel))
-      {
-        foreach (var tab in ExplorerViewModel.Instance.Tabs.OfType<MangaSettingsViewModel>().ToList())
-          ExplorerViewModel.Instance.Tabs.Remove(tab);
-      }
-    }
-
+
     public ICommand Save { get; }
 
     public ICommand UndoChanged { get; }

diff --git a/MangaReader.Avalonia/ViewModel/Explorer/ProxySettingSelectorModel.cs b/MangaReader.Avalonia/ViewModel/Explorer/ProxySettingSelectorModel.cs
@@ -10,7 +10,7 @@
 
 namespace MangaReader.Avalonia.ViewModel.Explorer
 {
-  public class ProxySettingSelectorModel : ExplorerTabViewModel
+  public class ProxySettingSelectorModel : SettingTabViewModel
   {
 
     public ProxySettingModel SelectedProxySettingModel

diff --git a/MangaReader.Avalonia/ViewModel/Explorer/SettingTabViewModel.cs b/MangaReader.Avalonia/ViewModel/Explorer/SettingTabViewModel.cs
@@ -0,0 +1,20 @@
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace MangaReader.Avalonia.ViewModel.Explorer
+{
+  public class SettingTabViewModel : ExplorerTabViewModel
+  {
+    public bool HideTab { get; set; } = true;
+
+    public override async Task OnUnselected(ExplorerTabViewModel newModel)
+    {
+      await base.OnUnselected(newModel).ConfigureAwait(true);
+      if (!(newModel is SettingTabViewModel))
+      {
+        foreach (var tab in ExplorerViewModel.Instance.Tabs.OfType<SettingTabViewModel>().Where(t => t.HideTab).ToList())
+          ExplorerViewModel.Instance.Tabs.Remove(tab);
+      }
+    }
+  }
+}
diff --git a/MangaReader.Avalonia/ViewModel/Explorer/SettingsViewModel.cs b/MangaReader.Avalonia/ViewModel/Explorer/SettingsViewModel.cs
@@ -9,7 +9,7 @@
 
 namespace MangaReader.Avalonia.ViewModel.Explorer
 {
-  public class SettingsViewModel : ExplorerTabViewModel
+  public class SettingsViewModel : SettingTabViewModel
   {
     public int AutoupdateLibraryInHours
     {
@@ -84,15 +84,10 @@ public override async Task OnSelected(ExplorerTabViewModel previousModel)
     public override async Task OnUnselected(ExplorerTabViewModel newModel)
     {
       await base.OnUnselected(newModel).ConfigureAwait(true);
-      if (!(newModel is SettingsViewModel || newModel is MangaSettingsViewModel || newModel is ProxySettingSelectorModel))
-      {
-        foreach (var tab in ExplorerViewModel.Instance.Tabs.OfType<MangaSettingsViewModel>().ToList())
-          ExplorerViewModel.Instance.Tabs.Remove(tab);
 
 #warning Нужно ресетить только после изменения порядка сортировки.
-        foreach (var model in ExplorerViewModel.Instance.Tabs.OfType<LibraryViewModel>())
-          model.ResetView();
-      }
+      foreach (var model in ExplorerViewModel.Instance.Tabs.OfType<LibraryViewModel>())
+        model.ResetView();
     }
 
     public ICommand Save { get; }
@@ -145,6 +140,7 @@ public SettingsViewModel()
     {
       this.Name = "Settings";
       this.Priority = 100;
+      this.HideTab = false;
 
       this.Save = new DelegateCommand(SaveConfig, () => true);
       this.UndoChanged = new DelegateCommand(ReloadConfig, () => true);