From fa3a3b2dad50de23d8b97b531bdb0a099c9bd263 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 30 May 2024 15:13:59 +0800
Subject: [PATCH] refactor: code cleanup

---
 src/Converters/BoolConverters.cs          |  9 ++--
 src/Converters/StringConverters.cs        |  2 +-
 src/Converters/WindowStateConverters.cs   | 14 ------
 src/Resources/Styles.axaml                |  6 +++
 src/ViewModels/AssumeUnchangedManager.cs  |  4 +-
 src/ViewModels/Clone.cs                   |  4 +-
 src/ViewModels/Repository.cs              | 17 ++-----
 src/ViewModels/StashesPage.cs             | 56 ++++++++++++---------
 src/ViewModels/Welcome.cs                 | 14 +++---
 src/ViewModels/WorkingCopy.cs             | 56 +++++++++++++++++++--
 src/Views/AssumeUnchangedManager.axaml    |  4 +-
 src/Views/AssumeUnchangedManager.axaml.cs |  7 +++
 src/Views/CaptionButtons.axaml            |  4 +-
 src/Views/CommitBaseInfo.axaml            | 16 +++---
 src/Views/DiffView.axaml                  |  3 +-
 src/Views/Histories.axaml                 |  1 -
 src/Views/Histories.axaml.cs              | 20 +-------
 src/Views/Launcher.axaml                  | 16 ++++--
 src/Views/Launcher.axaml.cs               | 61 -----------------------
 src/Views/Repository.axaml                | 16 +++++-
 src/Views/Repository.axaml.cs             | 45 -----------------
 src/Views/StashesPage.axaml               | 10 +---
 src/Views/StashesPage.axaml.cs            | 10 ++++
 src/Views/Welcome.axaml                   |  2 +-
 src/Views/WorkingCopy.axaml               | 10 +---
 25 files changed, 174 insertions(+), 233 deletions(-)

diff --git a/src/Converters/BoolConverters.cs b/src/Converters/BoolConverters.cs
index c860a1a6..2eb8c60a 100644
--- a/src/Converters/BoolConverters.cs
+++ b/src/Converters/BoolConverters.cs
@@ -1,18 +1,17 @@
-using Avalonia.Controls;
-using Avalonia.Data.Converters;
+using Avalonia.Data.Converters;
 using Avalonia.Media;
 
 namespace SourceGit.Converters
 {
     public static class BoolConverters
     {
+        public static readonly FuncValueConverter<bool, double> ToPageTabWidth =
+            new FuncValueConverter<bool, double>(x => x ? 200 : double.NaN);
+
         public static readonly FuncValueConverter<bool, double> HalfIfFalse =
             new FuncValueConverter<bool, double>(x => x ? 1 : 0.5);
 
         public static readonly FuncValueConverter<bool, FontWeight> BoldIfTrue =
             new FuncValueConverter<bool, FontWeight>(x => x ? FontWeight.Bold : FontWeight.Regular);
-
-        public static readonly FuncValueConverter<bool, GridLength> ToStarOrAutoGridLength =
-            new(value => value ? new GridLength(1, GridUnitType.Star) : new GridLength(1, GridUnitType.Auto));
     }
 }
diff --git a/src/Converters/StringConverters.cs b/src/Converters/StringConverters.cs
index 35491a16..aa687f23 100644
--- a/src/Converters/StringConverters.cs
+++ b/src/Converters/StringConverters.cs
@@ -69,7 +69,7 @@ namespace SourceGit.Converters
         public static readonly FormatByResourceKeyConverter FormatByResourceKey = new FormatByResourceKeyConverter();
 
         public static readonly FuncValueConverter<string, string> ToShortSHA =
-            new FuncValueConverter<string, string>(v => v.Length > 10 ? v.Substring(0, 10) : v);
+            new FuncValueConverter<string, string>(v => v == null ? string.Empty : (v.Length > 10 ? v.Substring(0, 10) : v));
         
         public static readonly FuncValueConverter<string, bool> UnderRecommendGitVersion =
             new(v =>
diff --git a/src/Converters/WindowStateConverters.cs b/src/Converters/WindowStateConverters.cs
index 2c3b2ac6..7122dc1f 100644
--- a/src/Converters/WindowStateConverters.cs
+++ b/src/Converters/WindowStateConverters.cs
@@ -3,7 +3,6 @@
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Data.Converters;
-using Avalonia.Media;
 
 namespace SourceGit.Converters
 {
@@ -39,19 +38,6 @@ namespace SourceGit.Converters
                 }
             });
 
-        public static readonly FuncValueConverter<WindowState, StreamGeometry> ToMaxOrRestoreIcon =
-            new FuncValueConverter<WindowState, StreamGeometry>(state =>
-            {
-                if (state == WindowState.Maximized)
-                {
-                    return Application.Current?.FindResource("Icons.Window.Restore") as StreamGeometry;
-                }
-                else
-                {
-                    return Application.Current?.FindResource("Icons.Window.Maximize") as StreamGeometry;
-                }
-            });
-
         public static readonly FuncValueConverter<WindowState, bool> IsNormal =
             new FuncValueConverter<WindowState, bool>(state => state == WindowState.Normal);
     }
diff --git a/src/Resources/Styles.axaml b/src/Resources/Styles.axaml
index 6b76c2cf..85ccca13 100644
--- a/src/Resources/Styles.axaml
+++ b/src/Resources/Styles.axaml
@@ -66,6 +66,12 @@
   <Style Selector="Button:pointerover Path.change_mode_switcher_icon">
     <Setter Property="Fill" Value="{DynamicResource Brush.Accent}"/>
   </Style>
+  <Style Selector="Button.max_or_restore_btn Path">
+    <Setter Property="Data" Value="{StaticResource Icons.Window.Maximize}"/>
+  </Style>
+  <Style Selector="Window[WindowState=Maximized] Button.max_or_restore_btn Path">
+    <Setter Property="Data" Value="{StaticResource Icons.Window.Restore}"/>
+  </Style>
 
   <Style Selector="TextBlock">
     <Setter Property="HorizontalAlignment" Value="Left"/>
diff --git a/src/ViewModels/AssumeUnchangedManager.cs b/src/ViewModels/AssumeUnchangedManager.cs
index a8208937..0da16552 100644
--- a/src/ViewModels/AssumeUnchangedManager.cs
+++ b/src/ViewModels/AssumeUnchangedManager.cs
@@ -24,9 +24,9 @@ namespace SourceGit.ViewModels
             });
         }
 
-        public void Remove(object param)
+        public void Remove(string file)
         {
-            if (param is string file)
+            if (!string.IsNullOrEmpty(file))
             {
                 new Commands.AssumeUnchanged(_repo).Remove(file);
                 Files.Remove(file);
diff --git a/src/ViewModels/Clone.cs b/src/ViewModels/Clone.cs
index 1e9bcb63..7db82081 100644
--- a/src/ViewModels/Clone.cs
+++ b/src/ViewModels/Clone.cs
@@ -50,10 +50,10 @@ namespace SourceGit.ViewModels
             set => SetProperty(ref _extraArgs, value);
         }
 
-        public Clone(Launcher launcher, LauncherPage page)
+        public Clone(Launcher launcher)
         {
             _launcher = launcher;
-            _page = page;
+            _page = launcher.ActivePage;
 
             View = new Views.Clone() { DataContext = this };
         }
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index c05ae641..cef2dddc 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -158,13 +158,6 @@ namespace SourceGit.ViewModels
             get => _stashesPage == null ? 0 : _stashesPage.Count;
         }
 
-        [JsonIgnore]
-        public bool CanCommitWithPush
-        {
-            get => _canCommitWithPush;
-            private set => SetProperty(ref _canCommitWithPush, value);
-        }
-
         [JsonIgnore]
         public bool IncludeUntracked
         {
@@ -172,9 +165,7 @@ namespace SourceGit.ViewModels
             set
             {
                 if (SetProperty(ref _includeUntracked, value))
-                {
                     Task.Run(RefreshWorkingCopyChanges);
-                }
             }
         }
 
@@ -567,8 +558,11 @@ namespace SourceGit.ViewModels
                 LocalBranchTrees = builder.Locals;
                 RemoteBranchTrees = builder.Remotes;
 
-                var cur = Branches.Find(x => x.IsCurrent);
-                CanCommitWithPush = cur != null && !string.IsNullOrEmpty(cur.Upstream);
+                if (_workingCopy != null)
+                {
+                    var cur = Branches.Find(x => x.IsCurrent);
+                    _workingCopy.CanCommitWithPush = cur != null && !string.IsNullOrEmpty(cur.Upstream);
+                }
             });
         }
 
@@ -1520,7 +1514,6 @@ namespace SourceGit.ViewModels
         private List<BranchTreeNode> _remoteBranchTrees = new List<BranchTreeNode>();
         private List<Models.Tag> _tags = new List<Models.Tag>();
         private List<string> _submodules = new List<string>();
-        private bool _canCommitWithPush = false;
         private bool _includeUntracked = true;
 
         private InProgressContext _inProgressContext = null;
diff --git a/src/ViewModels/StashesPage.cs b/src/ViewModels/StashesPage.cs
index bae81012..8276e654 100644
--- a/src/ViewModels/StashesPage.cs
+++ b/src/ViewModels/StashesPage.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-
+using Avalonia.Controls;
 using Avalonia.Threading;
 
 using CommunityToolkit.Mvvm.ComponentModel;
@@ -106,34 +106,42 @@ namespace SourceGit.ViewModels
             _diffContext = null;
         }
 
-        public void Apply(object param)
+        public ContextMenu MakeContextMenu(Models.Stash stash)
         {
-            if (param is Models.Stash stash)
-            {
-                Task.Run(() =>
-                {
-                    new Commands.Stash(_repo.FullPath).Apply(stash.Name);
-                });
-            }
-        }
+            if (stash == null)
+                return null;
 
-        public void Pop(object param)
-        {
-            if (param is Models.Stash stash)
+            var apply = new MenuItem();
+            apply.Header = App.Text("StashCM.Apply");
+            apply.Click += (o, ev) =>
             {
-                Task.Run(() =>
-                {
-                    new Commands.Stash(_repo.FullPath).Pop(stash.Name);
-                });
-            }
-        }
+                Task.Run(() => new Commands.Stash(_repo.FullPath).Apply(stash.Name));
+                ev.Handled = true;
+            };
 
-        public void Drop(object param)
-        {
-            if (param is Models.Stash stash && PopupHost.CanCreatePopup())
+            var pop = new MenuItem();
+            pop.Header = App.Text("StashCM.Pop");
+            pop.Click += (o, ev) =>
             {
-                PopupHost.ShowPopup(new DropStash(_repo.FullPath, stash));
-            }
+                Task.Run(() => new Commands.Stash(_repo.FullPath).Pop(stash.Name));
+                ev.Handled = true;
+            };
+
+            var drop = new MenuItem();
+            drop.Header = App.Text("StashCM.Drop");
+            drop.Click += (o, ev) =>
+            {
+                if (PopupHost.CanCreatePopup())
+                    PopupHost.ShowPopup(new DropStash(_repo.FullPath, stash));
+
+                ev.Handled = true;
+            };
+
+            var menu = new ContextMenu();
+            menu.Items.Add(apply);
+            menu.Items.Add(pop);
+            menu.Items.Add(drop);
+            return menu;
         }
 
         public void Clear()
diff --git a/src/ViewModels/Welcome.cs b/src/ViewModels/Welcome.cs
index 45bf7614..d077bfb7 100644
--- a/src/ViewModels/Welcome.cs
+++ b/src/ViewModels/Welcome.cs
@@ -2,6 +2,7 @@
 
 using Avalonia.Collections;
 using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
 
 using CommunityToolkit.Mvvm.ComponentModel;
 
@@ -40,20 +41,21 @@ namespace SourceGit.ViewModels
             }
         }
 
-        public void Clone(object param)
+        public void Clone()
         {
-            var launcher = param as Launcher;
-            var page = launcher.ActivePage;
-
             if (!Preference.Instance.IsGitConfigured)
             {
-                App.RaiseException(page.GetId(), App.Text("NotConfigured"));
+                App.RaiseException(string.Empty, App.Text("NotConfigured"));
                 return;
             }
 
             if (PopupHost.CanCreatePopup())
             {
-                PopupHost.ShowPopup(new Clone(launcher, page));
+                if (App.Current.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+                {
+                    var launcher = desktop.MainWindow.DataContext as Launcher;
+                    PopupHost.ShowPopup(new Clone(launcher));
+                }
             }
         }
 
diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
index e8897d48..2c4f1c3a 100644
--- a/src/ViewModels/WorkingCopy.cs
+++ b/src/ViewModels/WorkingCopy.cs
@@ -37,6 +37,29 @@ namespace SourceGit.ViewModels
 
     public class WorkingCopy : ObservableObject
     {
+        public bool IncludeUntracked
+        {
+            get => _repo.IncludeUntracked;
+            set
+            {
+                if (_repo.IncludeUntracked != value)
+                {
+                    _repo.IncludeUntracked = value;
+                    OnPropertyChanged(nameof(IncludeUntracked));
+                }
+            }
+        }
+
+        public bool CanCommitWithPush
+        {
+            get => _canCommitWithPush;
+            set
+            {
+                if (SetProperty(ref _canCommitWithPush, value))
+                    OnPropertyChanged(nameof(IsCommitWithPushVisible));
+            }
+        }
+
         public bool IsStaging
         {
             get => _isStaging;
@@ -74,9 +97,16 @@ namespace SourceGit.ViewModels
                         CommitMessage = commits[0].FullMessage;
                     }
                 }
+
+                OnPropertyChanged(nameof(IsCommitWithPushVisible));
             }
         }
 
+        public bool IsCommitWithPushVisible
+        {
+            get => !UseAmend && CanCommitWithPush;
+        }
+
         public List<Models.Change> Unstaged
         {
             get => _unstaged;
@@ -161,14 +191,31 @@ namespace SourceGit.ViewModels
         public void Cleanup()
         {
             _repo = null;
-            if (_unstaged != null)
-                _unstaged.Clear();
-            if (_staged != null)
-                _staged.Clear();
+
             if (_selectedUnstaged != null)
+            {
                 _selectedUnstaged.Clear();
+                OnPropertyChanged(nameof(SelectedUnstaged));
+            }
+
             if (_selectedStaged != null)
+            {
                 _selectedStaged.Clear();
+                OnPropertyChanged(nameof(SelectedStaged));
+            }
+
+            if (_unstaged != null)
+            {
+                _unstaged.Clear();
+                OnPropertyChanged(nameof(Unstaged));
+            }
+                
+            if (_staged != null)
+            {
+                _staged.Clear();
+                OnPropertyChanged(nameof(Staged));
+            }
+
             _detailContext = null;
             _commitMessage = string.Empty;
         }
@@ -1016,6 +1063,7 @@ namespace SourceGit.ViewModels
         private bool _isUnstaging = false;
         private bool _isCommitting = false;
         private bool _useAmend = false;
+        private bool _canCommitWithPush = false;
         private List<Models.Change> _unstaged = null;
         private List<Models.Change> _staged = null;
         private List<Models.Change> _selectedUnstaged = null;
diff --git a/src/Views/AssumeUnchangedManager.axaml b/src/Views/AssumeUnchangedManager.axaml
index 7289f0b4..6d8b2dc1 100644
--- a/src/Views/AssumeUnchangedManager.axaml
+++ b/src/Views/AssumeUnchangedManager.axaml
@@ -92,9 +92,7 @@
           <DataGridTemplateColumn>
             <DataGridTemplateColumn.CellTemplate>
               <DataTemplate>
-                <Button Classes="icon_button"
-                        Command="{Binding $parent[v:AssumeUnchangedManager].DataContext.(vm:AssumeUnchangedManager).Remove}"
-                        CommandParameter="{Binding}">
+                <Button Classes="icon_button" Click="OnRemoveButtonClicked">
                   <Path Width="14" Height="14" Data="{StaticResource Icons.Clear}"/>
                 </Button>
               </DataTemplate>
diff --git a/src/Views/AssumeUnchangedManager.axaml.cs b/src/Views/AssumeUnchangedManager.axaml.cs
index 7efc06a5..3035ab77 100644
--- a/src/Views/AssumeUnchangedManager.axaml.cs
+++ b/src/Views/AssumeUnchangedManager.axaml.cs
@@ -20,5 +20,12 @@ namespace SourceGit.Views
         {
             Close();
         }
+
+        private void OnRemoveButtonClicked(object sender, RoutedEventArgs e) {
+            if (DataContext is ViewModels.AssumeUnchangedManager vm && sender is Button button)
+                vm.Remove(button.DataContext as string);
+
+            e.Handled = true;
+        }
     }
 }
diff --git a/src/Views/CaptionButtons.axaml b/src/Views/CaptionButtons.axaml
index 53436340..7b778aff 100644
--- a/src/Views/CaptionButtons.axaml
+++ b/src/Views/CaptionButtons.axaml
@@ -11,8 +11,8 @@
     <Button Classes="caption_button" Click="MinimizeWindow">
       <Path Data="{StaticResource Icons.Window.Minimize}"/>
     </Button>
-    <Button Classes="caption_button" Click="MaximizeOrRestoreWindow">
-      <Path Data="{Binding $parent[Window].WindowState, Converter={x:Static c:WindowStateConverters.ToMaxOrRestoreIcon}}"/>
+    <Button Classes="caption_button max_or_restore_btn" Click="MaximizeOrRestoreWindow">
+      <Path/>
     </Button>
     <Button Classes="caption_button" Click="CloseWindow">
       <Path Data="{StaticResource Icons.Window.Close}" Width="9" Height="9"/>
diff --git a/src/Views/CommitBaseInfo.axaml b/src/Views/CommitBaseInfo.axaml
index 9e629b35..f1a3a0b7 100644
--- a/src/Views/CommitBaseInfo.axaml
+++ b/src/Views/CommitBaseInfo.axaml
@@ -12,11 +12,7 @@
     <DataTemplate DataType="m:Commit">
       <StackPanel Orientation="Vertical">
         <!-- Author & Committer -->
-        <Grid Margin="0,8">
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="{Binding IsCommitterVisible, Converter={x:Static c:BoolConverters.ToStarOrAutoGridLength}}"/>
-            <ColumnDefinition Width="*"/>
-          </Grid.ColumnDefinitions>
+        <UniformGrid Rows="1" Margin="0,8">
           <!-- Author -->
           <Grid Grid.Column="0" ColumnDefinitions="96,*">
             <v:Avatar Grid.Column="0" Width="64" Height="64" HorizontalAlignment="Right" User="{Binding Author}"/>
@@ -26,9 +22,9 @@
                 <SelectableTextBlock Text="{Binding Author.Name}" Margin="2,0,8,0"/>
                 <SelectableTextBlock Text="{Binding Author.Email}" ToolTip.Tip="{Binding Author.Email}" Foreground="{DynamicResource Brush.FG2}" TextTrimming="CharacterEllipsis"/>
               </DockPanel>
-              <SelectableTextBlock Text="{Binding AuthorTimeStr}" 
+              <SelectableTextBlock Text="{Binding AuthorTimeStr}"
                                    Margin="2,0,0,0"
-                                   FontSize="{Binding Source={x:Static vm:Preference.Instance}, Path=DefaultFontSize, Converter={x:Static c:FontSizeModifyConverters.Decrease}}" 
+                                   FontSize="{Binding Source={x:Static vm:Preference.Instance}, Path=DefaultFontSize, Converter={x:Static c:FontSizeModifyConverters.Decrease}}"
                                    Foreground="{DynamicResource Brush.FG2}"/>
             </StackPanel>
           </Grid>
@@ -42,13 +38,13 @@
                 <SelectableTextBlock Text="{Binding Committer.Name}" Margin="2,0,8,0"/>
                 <SelectableTextBlock Text="{Binding Committer.Email}" ToolTip.Tip="{Binding Committer.Email}" Foreground="{DynamicResource Brush.FG2}" TextTrimming="CharacterEllipsis"/>
               </DockPanel>
-              <SelectableTextBlock Text="{Binding CommitterTimeStr}" 
-                                   Margin="2,0,0,0" 
+              <SelectableTextBlock Text="{Binding CommitterTimeStr}"
+                                   Margin="2,0,0,0"
                                    FontSize="{Binding Source={x:Static vm:Preference.Instance}, Path=DefaultFontSize, Converter={x:Static c:FontSizeModifyConverters.Decrease}}"
                                    Foreground="{DynamicResource Brush.FG2}"/>
             </StackPanel>
           </Grid>
-        </Grid>
+        </UniformGrid>
 
         <!-- Line -->
         <Rectangle Height=".65" Margin="8" Fill="{DynamicResource Brush.Border2}" VerticalAlignment="Center"/>
diff --git a/src/Views/DiffView.axaml b/src/Views/DiffView.axaml
index e7646711..9705715c 100644
--- a/src/Views/DiffView.axaml
+++ b/src/Views/DiffView.axaml
@@ -213,7 +213,8 @@
 
           <!-- Text Diff -->
           <DataTemplate DataType="m:TextDiff">
-            <v:TextDiffView TextDiff="{Binding}" UseSideBySideDiff="{Binding Source={x:Static vm:Preference.Instance}, Path=UseSideBySideDiff, Mode=OneWay}"/>
+            <v:TextDiffView TextDiff="{Binding}"
+                            UseSideBySideDiff="{Binding Source={x:Static vm:Preference.Instance}, Path=UseSideBySideDiff, Mode=OneWay}"/>
           </DataTemplate>
 
           <!-- No or only EOL changes -->
diff --git a/src/Views/Histories.axaml b/src/Views/Histories.axaml
index b14dc0b5..3c4e1c6a 100644
--- a/src/Views/Histories.axaml
+++ b/src/Views/Histories.axaml
@@ -129,7 +129,6 @@
       </DataGrid>
 
       <v:CommitGraph x:Name="commitGraph"
-                     BindingDataGrid="{Binding #commitDataGrid}"
                      Graph="{Binding Graph}"
                      DotBrush="{DynamicResource Brush.Contents}"
                      HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
diff --git a/src/Views/Histories.axaml.cs b/src/Views/Histories.axaml.cs
index f1bd9698..9b32ee83 100644
--- a/src/Views/Histories.axaml.cs
+++ b/src/Views/Histories.axaml.cs
@@ -3,7 +3,6 @@ using System;
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
-using Avalonia.Data;
 using Avalonia.Media;
 using Avalonia.VisualTree;
 
@@ -90,15 +89,6 @@ namespace SourceGit.Views
             set => SetValue(GraphProperty, value);
         }
 
-        public static readonly StyledProperty<DataGrid> BindingDataGridProperty =
-            AvaloniaProperty.Register<CommitGraph, DataGrid>(nameof(BindingDataGrid));
-
-        public DataGrid BindingDataGrid
-        {
-            get => GetValue(BindingDataGridProperty);
-            set => SetValue(BindingDataGridProperty, value);
-        }
-
         public static readonly StyledProperty<IBrush> DotBrushProperty =
             AvaloniaProperty.Register<CommitGraph, IBrush>(nameof(DotBrush), Brushes.Transparent);
 
@@ -108,17 +98,13 @@ namespace SourceGit.Views
             set => SetValue(DotBrushProperty, value);
         }
 
-        static CommitGraph()
-        {
-            AffectsRender<CommitGraph>(BindingDataGridProperty, GraphProperty, DotBrushProperty);
-        }
-
         public override void Render(DrawingContext context)
         {
             base.Render(context);
 
+            var parent = this.FindAncestorOfType<Histories>();
             var graph = Graph;
-            var grid = BindingDataGrid;
+            var grid = parent.commitDataGrid;
             if (graph == null || grid == null)
                 return;
 
@@ -277,8 +263,6 @@ namespace SourceGit.Views
         public Histories()
         {
             InitializeComponent();
-
-            this.Bind(NavigationIdProperty, new Binding("NavigationId", BindingMode.OneWay));
         }
 
         private void OnCommitDataGridLayoutUpdated(object sender, EventArgs e)
diff --git a/src/Views/Launcher.axaml b/src/Views/Launcher.axaml
index 637bbb3a..05eca820 100644
--- a/src/Views/Launcher.axaml
+++ b/src/Views/Launcher.axaml
@@ -166,7 +166,7 @@
                       </ContextMenu>
                     </Border.ContextMenu>
 
-                    <v:LauncherTab UseFixedTabWidth="{Binding Source={x:Static vm:Preference.Instance}, Path=UseFixedTabWidth}" Height="30" ColumnDefinitions="Auto,*,Auto" VerticalAlignment="Center">
+                    <Grid Width="{Binding Source={x:Static vm:Preference.Instance}, Path=UseFixedTabWidth, Converter={x:Static c:BoolConverters.ToPageTabWidth}}" Height="30" ColumnDefinitions="Auto,*,Auto" VerticalAlignment="Center">
                       <Path Grid.Column="0"
                             Width="12" Height="12" Margin="12,0"
                             Fill="{Binding Node.Bookmark, Converter={x:Static c:BookmarkConverters.ToBrush}}"
@@ -219,7 +219,7 @@
                           </MultiBinding>
                         </Rectangle.IsVisible>
                       </Rectangle>
-                    </v:LauncherTab>
+                    </Grid>
                   </Border>
                 </DataTemplate>
               </ListBox.ItemTemplate>
@@ -253,7 +253,17 @@
     </Grid>
 
     <!-- Page body -->
-    <v:LauncherBody Grid.Row="1" Background="{DynamicResource Brush.ToolBar}" Data="{Binding ActivePage.Data}"/>
+    <ContentControl Grid.Row="1" Background="{DynamicResource Brush.ToolBar}" Content="{Binding ActivePage.Data}">
+      <ContentControl.DataTemplates>
+        <DataTemplate DataType="vm:Welcome">
+          <v:Welcome/>
+        </DataTemplate>
+
+        <DataTemplate DataType="vm:Repository">
+          <v:Repository/>
+        </DataTemplate>
+      </ContentControl.DataTemplates>
+    </ContentControl>
 
     <!-- Popup container -->
     <Grid Grid.Row="1" Margin="0,36,0,0" IsVisible="{Binding ActivePage.Popup, Converter={x:Static ObjectConverters.IsNotNull}}">
diff --git a/src/Views/Launcher.axaml.cs b/src/Views/Launcher.axaml.cs
index fd6fd690..a72d7c2c 100644
--- a/src/Views/Launcher.axaml.cs
+++ b/src/Views/Launcher.axaml.cs
@@ -7,67 +7,6 @@ using Avalonia.Interactivity;
 
 namespace SourceGit.Views
 {
-    public class LauncherTab : Grid
-    {
-        public static readonly StyledProperty<bool> UseFixedTabWidthProperty =
-            AvaloniaProperty.Register<LauncherTab, bool>(nameof(UseFixedTabWidth), false);
-
-        public bool UseFixedTabWidth
-        {
-            get => GetValue(UseFixedTabWidthProperty);
-            set => SetValue(UseFixedTabWidthProperty, value);
-        }
-
-        protected override Type StyleKeyOverride => typeof(Grid);
-
-        static LauncherTab()
-        {
-            UseFixedTabWidthProperty.Changed.AddClassHandler<LauncherTab>((tab, ev) =>
-            {
-                tab.Width = tab.UseFixedTabWidth ? 200.0 : double.NaN;
-            });
-        }
-    }
-
-    public class LauncherBody : Border
-    {
-        public static readonly StyledProperty<object> DataProperty =
-            AvaloniaProperty.Register<LauncherBody, object>(nameof(Data), false);
-
-        public object Data
-        {
-            get => GetValue(DataProperty);
-            set => SetValue(DataProperty, value);
-        }
-
-        protected override Type StyleKeyOverride => typeof(Border);
-
-        static LauncherBody()
-        {
-            DataProperty.Changed.AddClassHandler<LauncherBody>((body, ev) =>
-            {
-                var data = body.Data;
-
-                if (data == null)
-                {
-                    body.Child = null;
-                }
-                else if (data is ViewModels.Welcome)
-                {
-                    body.Child = new Welcome { DataContext = data };
-                }
-                else if (data is ViewModels.Repository)
-                {
-                    body.Child = new Repository { DataContext = data };
-                }
-                else
-                {
-                    body.Child = null;
-                }
-            });
-        }
-    }
-
     public partial class Launcher : Window, Models.INotificationReceiver
     {
         public Launcher()
diff --git a/src/Views/Repository.axaml b/src/Views/Repository.axaml
index 09129811..5a3b9d52 100644
--- a/src/Views/Repository.axaml
+++ b/src/Views/Repository.axaml
@@ -589,7 +589,21 @@
           <Button Grid.Column="3" Classes="flat" FontWeight="Regular" Content="{DynamicResource Text.Repository.Abort}" Height="20" Padding="8,0" Margin="4,0" Command="{Binding AbortMerge}"/>
         </Grid>
 
-        <v:RepositorySubView Grid.Row="1" Data="{Binding SelectedView}"/>
+        <ContentControl Grid.Row="1" Content="{Binding SelectedView}">
+          <ContentControl.DataTemplates>
+            <DataTemplate DataType="vm:Histories">
+              <v:Histories NavigationId="{Binding NavigationId}"/>
+            </DataTemplate>
+
+            <DataTemplate DataType="vm:WorkingCopy">
+              <v:WorkingCopy/>
+            </DataTemplate>
+
+            <DataTemplate DataType="vm:StashesPage">
+              <v:StashesPage/>
+            </DataTemplate>
+          </ContentControl.DataTemplates>
+        </ContentControl>
       </Grid>
     </Grid>
   </Grid>
diff --git a/src/Views/Repository.axaml.cs b/src/Views/Repository.axaml.cs
index 8b66ceb9..97aa01f3 100644
--- a/src/Views/Repository.axaml.cs
+++ b/src/Views/Repository.axaml.cs
@@ -11,51 +11,6 @@ using Avalonia.VisualTree;
 
 namespace SourceGit.Views
 {
-    public class RepositorySubView : Border
-    {
-        public static readonly StyledProperty<object> DataProperty =
-            AvaloniaProperty.Register<RepositorySubView, object>(nameof(Data), false);
-
-        public object Data
-        {
-            get => GetValue(DataProperty);
-            set => SetValue(DataProperty, value);
-        }
-
-        protected override Type StyleKeyOverride => typeof(Border);
-
-        static RepositorySubView()
-        {
-            DataProperty.Changed.AddClassHandler<RepositorySubView>((view, ev) =>
-            {
-                var data = view.Data;
-
-                if (data == null)
-                {
-                    view.Child = null;
-                }
-                else if (data is ViewModels.Histories)
-                {
-                    view.Child = new Histories { DataContext = data };
-                }
-                else if (data is ViewModels.WorkingCopy)
-                {
-                    view.Child = new WorkingCopy { DataContext = data };
-                }
-                else if (data is ViewModels.StashesPage)
-                {
-                    view.Child = new StashesPage { DataContext = data };
-                }
-                else
-                {
-                    view.Child = null;
-                }
-
-                GC.Collect();
-            });
-        }
-    }
-
     public partial class Repository : UserControl
     {
         public Repository()
diff --git a/src/Views/StashesPage.axaml b/src/Views/StashesPage.axaml
index 5828ef86..a3d91d59 100644
--- a/src/Views/StashesPage.axaml
+++ b/src/Views/StashesPage.axaml
@@ -54,15 +54,7 @@
           <DataGridTemplateColumn Width="*">
             <DataGridTemplateColumn.CellTemplate>
               <DataTemplate DataType="m:Stash">
-                <Border BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="0,0,0,1" Padding="4" Background="Transparent">
-                  <Border.ContextMenu>
-                    <ContextMenu>
-                      <MenuItem Header="{DynamicResource Text.StashCM.Apply}" Command="{Binding $parent[v:StashesPage].DataContext.(vm:StashesPage).Apply}" CommandParameter="{Binding}"/>
-                      <MenuItem Header="{DynamicResource Text.StashCM.Pop}" Command="{Binding $parent[v:StashesPage].DataContext.(vm:StashesPage).Pop}" CommandParameter="{Binding}"/>
-                      <MenuItem Header="{DynamicResource Text.StashCM.Drop}" Command="{Binding $parent[v:StashesPage].DataContext.(vm:StashesPage).Drop}" CommandParameter="{Binding}"/>
-                    </ContextMenu>
-                  </Border.ContextMenu>
-
+                <Border BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="0,0,0,1" Padding="4" Background="Transparent" ContextRequested="OnStashContextRequested">
                   <Grid RowDefinitions="Auto,*" >
                     <Grid Grid.Row="0" ColumnDefinitions="*,Auto">
                       <TextBlock Grid.Column="0" Classes="monospace" Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" TextDecorations="Underline" Cursor="Hand"/>
diff --git a/src/Views/StashesPage.axaml.cs b/src/Views/StashesPage.axaml.cs
index 3bb5cbb5..13b74ee2 100644
--- a/src/Views/StashesPage.axaml.cs
+++ b/src/Views/StashesPage.axaml.cs
@@ -8,5 +8,15 @@ namespace SourceGit.Views
         {
             InitializeComponent();
         }
+
+        private void OnStashContextRequested(object sender, ContextRequestedEventArgs e)
+        {
+            if (DataContext is ViewModels.StashesPage vm && sender is Border border)
+            {
+                var menu = vm.MakeContextMenu(border.DataContext as Models.Stash);
+                border.OpenContextMenu(menu);
+            }
+            e.Handled = true;
+        }
     }
 }
diff --git a/src/Views/Welcome.axaml b/src/Views/Welcome.axaml
index fef229a2..ceccc0ce 100644
--- a/src/Views/Welcome.axaml
+++ b/src/Views/Welcome.axaml
@@ -11,7 +11,7 @@
   <Grid RowDefinitions="36,*,36" Background="{DynamicResource Brush.Window}">
     <Border Grid.Row="0" BorderBrush="{DynamicResource Brush.Border0}" BorderThickness="0,0,0,1" Background="{DynamicResource Brush.ToolBar}">
       <StackPanel Orientation="Horizontal" Margin="4,0,0,0">
-        <Button Classes="icon_button" Width="32" Command="{Binding Clone}" CommandParameter="{Binding $parent[v:Launcher].DataContext}" ToolTip.Tip="{DynamicResource Text.Welcome.Clone}">
+        <Button Classes="icon_button" Width="32" Command="{Binding Clone}" ToolTip.Tip="{DynamicResource Text.Welcome.Clone}">
           <Path Width="13" Height="13" Data="{StaticResource Icons.Pull}"/>
         </Button>
 
diff --git a/src/Views/WorkingCopy.axaml b/src/Views/WorkingCopy.axaml
index df3ae7d6..5aa72ff7 100644
--- a/src/Views/WorkingCopy.axaml
+++ b/src/Views/WorkingCopy.axaml
@@ -211,14 +211,8 @@
                 Height="28"
                 Margin="8,0,0,0"
                 Padding="8,0"
-                Command="{Binding CommitWithPush}">
-          <Button.IsVisible>
-            <MultiBinding Converter="{x:Static BoolConverters.And}">
-              <Binding Path="$parent[v:Repository].DataContext.(vm:Repository).CanCommitWithPush"/>
-              <Binding Path="!UseAmend"/>
-            </MultiBinding>
-          </Button.IsVisible>
-        </Button>
+                Command="{Binding CommitWithPush}"
+                IsVisible="{Binding IsCommitWithPushVisible}"/>
       </Grid>
     </Grid>
   </Grid>