From 7b70951c937b28752c506f77389419ad9c69f355 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 1 Mar 2024 14:09:39 +0800
Subject: [PATCH] style<Launcher>: supports two size rules for tabs in titlebar
 - fixed width or size to content

---
 src/Resources/Locales/en_US.axaml |  1 +
 src/Resources/Locales/zh_CN.axaml |  1 +
 src/ViewModels/Preference.cs      |  6 ++++++
 src/Views/Launcher.axaml          | 16 +++++++---------
 src/Views/Launcher.axaml.cs       | 19 +++++++++++++++++++
 src/Views/Preference.axaml        |  7 ++++++-
 6 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 4e2ea7a7..9d068e94 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -381,6 +381,7 @@
   <sys:String x:Key="Text.Preference.General.Theme">Theme</sys:String>
   <sys:String x:Key="Text.Preference.General.MaxHistoryCommits">History Commits</sys:String>
   <sys:String x:Key="Text.Preference.General.RestoreTabs">Restore windows</sys:String>
+  <sys:String x:Key="Text.Preference.General.UseFixedTabWidth">Use fixed tab width in titlebar</sys:String>
   <sys:String x:Key="Text.Preference.General.UseMacOSStyle">Use macOS style titlebar</sys:String>
   <sys:String x:Key="Text.Preference.Git">GIT</sys:String>
   <sys:String x:Key="Text.Preference.Git.Path">Install Path</sys:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 5850a2fc..3deb6206 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -380,6 +380,7 @@
   <sys:String x:Key="Text.Preference.General.Theme">主题</sys:String>
   <sys:String x:Key="Text.Preference.General.MaxHistoryCommits">最大历史提交数</sys:String>
   <sys:String x:Key="Text.Preference.General.RestoreTabs">启动时恢复上次打开的仓库</sys:String>
+  <sys:String x:Key="Text.Preference.General.UseFixedTabWidth">使用固定宽度的标题栏标签</sys:String>
   <sys:String x:Key="Text.Preference.General.UseMacOSStyle">使用macOS风格的标题栏</sys:String>
   <sys:String x:Key="Text.Preference.Git">GIT配置</sys:String>
   <sys:String x:Key="Text.Preference.Git.Path">安装路径</sys:String>
diff --git a/src/ViewModels/Preference.cs b/src/ViewModels/Preference.cs
index c453e63c..d711622e 100644
--- a/src/ViewModels/Preference.cs
+++ b/src/ViewModels/Preference.cs
@@ -71,6 +71,11 @@ namespace SourceGit.ViewModels {
             set => SetProperty(ref _restoreTabs, value);
         }
 
+        public bool UseFixedTabWidth {
+            get => _useFixedTabWidth;
+            set => SetProperty(ref _useFixedTabWidth, value);
+        }
+
         public bool UseMacOSStyle {
             get => _useMacOSStyle;
             set => SetProperty(ref _useMacOSStyle, value);
@@ -274,6 +279,7 @@ namespace SourceGit.ViewModels {
         private string _theme = "Default";
         private int _maxHistoryCommits = 20000;
         private bool _restoreTabs = false;
+        private bool _useFixedTabWidth = true;
         private bool _useMacOSStyle = OperatingSystem.IsMacOS();
         private bool _useTwoColumnsLayoutInHistories = false;
         private bool _useCombinedTextDiff = true;
diff --git a/src/Views/Launcher.axaml b/src/Views/Launcher.axaml
index 5645c443..c98ad8fb 100644
--- a/src/Views/Launcher.axaml
+++ b/src/Views/Launcher.axaml
@@ -138,19 +138,17 @@
                       </ContextMenu>
                     </Border.ContextMenu>
 
-                    <Grid Classes="launcher_pagetab_container" Width="200" Height="30" ColumnDefinitions="Auto,*,Auto" VerticalAlignment="Center">
-                      <Path Classes="launcher_pagetab_icon"
-                            Grid.Column="0"
-                            Width="12" Height="12" Margin="12,0,8,0"
+                    <v:LauncherTab UseFixedTabWidth="{Binding Source={x:Static vm:Preference.Instance}, Path=UseFixedTabWidth}" 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}}"
                             StrokeThickness="{Binding Node.Bookmark, Converter={x:Static c:BookmarkConverters.ToStrokeThickness}}"
                             Stroke="{DynamicResource Brush.FG1}"
                             Data="{StaticResource Icons.Bookmark}"
                             IsVisible="{Binding Node.IsRepository}"
                             IsHitTestVisible="False"/>
-                      <Path Classes="launcher_pagetab_icon"
-                            Grid.Column="0"
-                            Width="12" Height="12" Margin="12,0,8,0"
+                      <Path Grid.Column="0"
+                            Width="12" Height="12" Margin="12,0"
                             Fill="{DynamicResource Brush.FG1}"
                             Data="{StaticResource Icons.Repositories}"
                             IsVisible="{Binding !Node.IsRepository}"
@@ -171,7 +169,7 @@
                                  IsHitTestVisible="False"/>
                       <Button Grid.Column="2"
                               Classes="icon_button"
-                              Width="16" Height="16" Margin="8,0"
+                              Width="16" Height="16" Margin="12,0"
                               Command="{Binding #me.DataContext.(vm:Launcher).CloseTab}"
                               CommandParameter="{Binding}"
                               ToolTip.Tip="{DynamicResource Text.PageTabBar.Tab.Close}">
@@ -186,7 +184,7 @@
                           </MultiBinding>
                         </Rectangle.IsVisible>
                       </Rectangle>
-                    </Grid>
+                    </v:LauncherTab>
                   </Border>
                 </DataTemplate>
               </ListBox.ItemTemplate>
diff --git a/src/Views/Launcher.axaml.cs b/src/Views/Launcher.axaml.cs
index 6d17e383..4ba8fe43 100644
--- a/src/Views/Launcher.axaml.cs
+++ b/src/Views/Launcher.axaml.cs
@@ -2,8 +2,27 @@ using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Input;
 using Avalonia.Interactivity;
+using System;
 
 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 partial class Launcher : Window, Models.INotificationReceiver {
         public Launcher() {
             DataContext = new ViewModels.Launcher();
diff --git a/src/Views/Preference.axaml b/src/Views/Preference.axaml
index 081c748f..d2e2431e 100644
--- a/src/Views/Preference.axaml
+++ b/src/Views/Preference.axaml
@@ -57,7 +57,7 @@
         <TabItem.Header>
           <TextBlock Classes="tab_header" Text="{DynamicResource Text.Preference.General}"/>
         </TabItem.Header>
-        <Grid Margin="8" RowDefinitions="32,32,32,32,32,Auto" ColumnDefinitions="Auto,*">
+        <Grid Margin="8" RowDefinitions="32,32,32,32,32,32,Auto" ColumnDefinitions="Auto,*">
           <TextBlock Grid.Row="0" Grid.Column="0"
                      Text="{DynamicResource Text.Preference.General.Locale}"
                      HorizontalAlignment="Right"
@@ -135,6 +135,11 @@
                     IsChecked="{Binding RestoreTabs, Mode=TwoWay}"/>
 
           <CheckBox Grid.Row="5" Grid.Column="1"
+                    Height="32"
+                    Content="{DynamicResource Text.Preference.General.UseFixedTabWidth}"
+                    IsChecked="{Binding Source={x:Static vm:Preference.Instance}, Path=UseFixedTabWidth, Mode=TwoWay}"/>
+
+          <CheckBox Grid.Row="6" Grid.Column="1"
                     Height="32"
                     Content="{DynamicResource Text.Preference.General.UseMacOSStyle}"
                     IsChecked="{Binding Source={x:Static vm:Preference.Instance}, Path=UseMacOSStyle, Mode=TwoWay}"