From ed7e6d4012bda3e85d16badcec35a327c754796c Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 16 Oct 2025 15:26:35 +0800
Subject: [PATCH] ux: remove `Use fixed tab width in titlebar` option from
 `Preferences` and makes it the only and default

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Converters/BoolConverters.cs  | 3 ---
 src/Resources/Locales/en_US.axaml | 1 -
 src/ViewModels/Preferences.cs     | 7 -------
 src/Views/LauncherTabBar.axaml    | 2 +-
 src/Views/Preferences.axaml       | 9 ++-------
 5 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/src/Converters/BoolConverters.cs b/src/Converters/BoolConverters.cs
index d101c641..8a2f3141 100644
--- a/src/Converters/BoolConverters.cs
+++ b/src/Converters/BoolConverters.cs
@@ -5,9 +5,6 @@ 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, FontWeight> IsBoldToFontWeight =
             new FuncValueConverter<bool, FontWeight>(x => x ? FontWeight.Bold : FontWeight.Regular);
 
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 163e2a7d..6a142842 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -570,7 +570,6 @@
   <x:String x:Key="Text.Preferences.Appearance.Theme" xml:space="preserve">Theme</x:String>
   <x:String x:Key="Text.Preferences.Appearance.ThemeOverrides" xml:space="preserve">Theme Overrides</x:String>
   <x:String x:Key="Text.Preferences.Appearance.UseAutoHideScrollBars" xml:space="preserve">Use auto-hide scrollbars</x:String>
-  <x:String x:Key="Text.Preferences.Appearance.UseFixedTabWidth" xml:space="preserve">Use fixed tab width in titlebar</x:String>
   <x:String x:Key="Text.Preferences.Appearance.UseNativeWindowFrame" xml:space="preserve">Use native window frame</x:String>
   <x:String x:Key="Text.Preferences.DiffMerge" xml:space="preserve">DIFF/MERGE TOOL</x:String>
   <x:String x:Key="Text.Preferences.DiffMerge.Path" xml:space="preserve">Install Path</x:String>
diff --git a/src/ViewModels/Preferences.cs b/src/ViewModels/Preferences.cs
index 5b5bc31f..f7beb968 100644
--- a/src/ViewModels/Preferences.cs
+++ b/src/ViewModels/Preferences.cs
@@ -148,12 +148,6 @@ namespace SourceGit.ViewModels
             }
         }
 
-        public bool UseFixedTabWidth
-        {
-            get => _useFixedTabWidth;
-            set => SetProperty(ref _useFixedTabWidth, value);
-        }
-
         public bool UseAutoHideScrollBars
         {
             get => _useAutoHideScrollBars;
@@ -718,7 +712,6 @@ namespace SourceGit.ViewModels
 
         private int _maxHistoryCommits = 20000;
         private int _subjectGuideLength = 50;
-        private bool _useFixedTabWidth = true;
         private bool _useAutoHideScrollBars = true;
         private bool _useGitHubStyleAvatar = true;
         private bool _showAuthorTimeInGraph = false;
diff --git a/src/Views/LauncherTabBar.axaml b/src/Views/LauncherTabBar.axaml
index 4dafba4d..b14254e6 100644
--- a/src/Views/LauncherTabBar.axaml
+++ b/src/Views/LauncherTabBar.axaml
@@ -42,7 +42,7 @@
 
           <ListBox.ItemTemplate>
             <DataTemplate DataType="vm:LauncherPage">
-              <Border Width="{Binding Source={x:Static vm:Preferences.Instance}, Path=UseFixedTabWidth, Converter={x:Static c:BoolConverters.ToPageTabWidth}}" Height="30"
+              <Border Width="200" Height="30"
                       Padding="0,2,0,0"
                       Background="Transparent"
                       PointerPressed="OnPointerPressedTab"
diff --git a/src/Views/Preferences.axaml b/src/Views/Preferences.axaml
index f484d2cd..8d37bed2 100644
--- a/src/Views/Preferences.axaml
+++ b/src/Views/Preferences.axaml
@@ -179,7 +179,7 @@
           <TabItem.Header>
             <TextBlock Classes="tab_header" Text="{DynamicResource Text.Preferences.Appearance}"/>
           </TabItem.Header>
-          <Grid Margin="8" RowDefinitions="32,32,32,32,32,32,32,32,Auto" ColumnDefinitions="Auto,*">
+          <Grid Margin="8" RowDefinitions="32,32,32,32,32,32,32,Auto" ColumnDefinitions="Auto,*">
             <TextBlock Grid.Row="0" Grid.Column="0"
                        Text="{DynamicResource Text.Preferences.Appearance.Theme}"
                        HorizontalAlignment="Right"
@@ -277,16 +277,11 @@
             </TextBox>
 
             <CheckBox Grid.Row="6" Grid.Column="1"
-                      Height="32"
-                      Content="{DynamicResource Text.Preferences.Appearance.UseFixedTabWidth}"
-                      IsChecked="{Binding UseFixedTabWidth, Mode=TwoWay}"/>
-
-            <CheckBox Grid.Row="7" Grid.Column="1"
                       Height="32"
                       Content="{DynamicResource Text.Preferences.Appearance.UseAutoHideScrollBars}"
                       IsChecked="{Binding UseAutoHideScrollBars, Mode=TwoWay}"/>
 
-            <CheckBox Grid.Row="8" Grid.Column="1"
+            <CheckBox Grid.Row="7" Grid.Column="1"
                       Height="32"
                       Content="{DynamicResource Text.Preferences.Appearance.UseNativeWindowFrame}"
                       IsChecked="{Binding UseSystemWindowFrame, Mode=OneTime}"