code_style: simple window do not using DataContext

love-linger · love-linger · commit 0860245674b7 · 2025-03-07T15:44:50.000+08:00
Signed-off-by: leo &lt;longshuang@msn.cn&gt;
diff --git a/src/App.axaml.cs b/src/App.axaml.cs
@@ -445,10 +445,14 @@ private bool TryLaunchAsCoreEditor(IClassicDesktopStyleApplicationLifetime deskt
 
             var file = args[1];
             if (!File.Exists(file))
+            {
                 desktop.Shutdown(-1);
-            else
-                desktop.MainWindow = new Views.StandaloneCommitMessageEditor(file);
+                return true;
+            }
 
+            var editor = new Views.StandaloneCommitMessageEditor();
+            editor.SetFile(file);
+            desktop.MainWindow = editor;
             return true;
         }
 
@@ -461,7 +465,9 @@ private bool TryLaunchAsAskpass(IClassicDesktopStyleApplicationLifetime desktop)
             var args = desktop.Args;
             if (args?.Length > 0)
             {
-                desktop.MainWindow = new Views.Askpass(args[0]);
+                var askpass = new Views.Askpass();
+                askpass.TxtDescription.Text = args[0];
+                desktop.MainWindow = askpass;
                 return true;
             }
 
diff --git a/src/Views/Askpass.axaml b/src/Views/Askpass.axaml
@@ -5,15 +5,15 @@
                     xmlns:v="using:SourceGit.Views"
                     mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
                     x:Class="SourceGit.Views.Askpass"
-                    x:DataType="v:Askpass"
+                    x:Name="ThisControl"
                     Icon="/App.ico"
                     Title="{DynamicResource Text.Askpass}"
                     SizeToContent="WidthAndHeight"
                     CanResize="False"
                     WindowStartupLocation="CenterScreen">
   <Grid RowDefinitions="Auto,*">
     <!-- TitleBar -->
-    <Grid Grid.Row="0" Height="28" IsVisible="{Binding !UseSystemWindowFrame}">
+    <Grid Grid.Row="0" Height="28" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
       <Border Background="{DynamicResource Brush.TitleBar}"
               BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
               PointerPressed="BeginMoveWindow"/>
@@ -36,23 +36,23 @@
 
     <StackPanel Grid.Row="1" Margin="0,16" Orientation="Vertical">
       <Border Margin="16,0">
-        <TextBlock Text="{Binding Description}" TextWrapping="Wrap"/>
+        <TextBlock x:Name="TxtDescription" Text="Enter passphrase:" TextWrapping="Wrap"/>
       </Border>
       
-      <TextBox Margin="16"
-               MinWidth="300" 
-               Height="32" 
+      <TextBox x:Name="TxtPassphrase"
+               Margin="16"
+               MinWidth="300"
+               Height="32"
                Focusable="True"
-               Text="{Binding Passphrase, Mode=TwoWay}" 
                PasswordChar="*"
-               RevealPassword="{Binding ShowPassword, Mode=OneWay}"
+               RevealPassword="{Binding #ToggleShowPassword.IsChecked, Mode=OneWay}"
                HorizontalAlignment="Stretch"
                v:AutoFocusBehaviour.IsEnabled="True">
         <TextBox.InnerRightContent>
           <ToggleButton Grid.Column="6"
+                        x:Name="ToggleShowPassword"
                         Classes="toggle_untracked"
-                        Width="26" Height="14"
-                        IsChecked="{Binding ShowPassword, Mode=TwoWay}"/>
+                        Width="26" Height="14"/>
         </TextBox.InnerRightContent>
       </TextBox>
       
diff --git a/src/Views/Askpass.axaml.cs b/src/Views/Askpass.axaml.cs
@@ -1,43 +1,12 @@
 using System;
-
-using Avalonia;
 using Avalonia.Interactivity;
 
 namespace SourceGit.Views
 {
     public partial class Askpass : ChromelessWindow
     {
-        public static readonly StyledProperty<bool> ShowPasswordProperty =
-            AvaloniaProperty.Register<Askpass, bool>(nameof(ShowPassword));
-
-        public bool ShowPassword
-        {
-            get => GetValue(ShowPasswordProperty);
-            set => SetValue(ShowPasswordProperty, value);
-        }
-
-        public string Description
-        {
-            get;
-            private set;
-        } = string.Empty;
-
-        public string Passphrase
-        {
-            get;
-            set;
-        } = string.Empty;
-
         public Askpass()
         {
-            DataContext = this;
-            InitializeComponent();
-        }
-
-        public Askpass(string description)
-        {
-            Description = description;
-            DataContext = this;
             InitializeComponent();
         }
 
@@ -49,7 +18,8 @@ private void CloseWindow(object _1, RoutedEventArgs _2)
 
         private void EnterPassword(object _1, RoutedEventArgs _2)
         {
-            Console.Out.Write($"{Passphrase}\n");
+            var passphrase = TxtPassphrase.Text ?? string.Empty;
+            Console.Out.Write($"{passphrase}\n");
             App.Quit(0);
         }
     }
diff --git a/src/Views/ChangeViewModeSwitcher.axaml b/src/Views/ChangeViewModeSwitcher.axaml
@@ -6,21 +6,21 @@
              xmlns:v="using:SourceGit.Views"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="SourceGit.Views.ChangeViewModeSwitcher"
-             x:DataType="v:ChangeViewModeSwitcher">
+             x:Name="ThisControl">
   <Button Classes="icon_button" ToolTip.Tip="{DynamicResource Text.ChangeDisplayMode}">
     <Button.Flyout>
       <MenuFlyout Placement="BottomEdgeAlignedLeft">
-        <MenuItem Header="{DynamicResource Text.ChangeDisplayMode.List}" Command="{Binding SwitchMode}" CommandParameter="{x:Static m:ChangeViewMode.List}">
+        <MenuItem Header="{DynamicResource Text.ChangeDisplayMode.List}" Click="SwitchToList">
           <MenuItem.Icon>
             <Path Width="12" Height="12" Data="{StaticResource Icons.List}"/>
           </MenuItem.Icon>
         </MenuItem>
-        <MenuItem Header="{DynamicResource Text.ChangeDisplayMode.Grid}" Command="{Binding SwitchMode}" CommandParameter="{x:Static m:ChangeViewMode.Grid}">
+        <MenuItem Header="{DynamicResource Text.ChangeDisplayMode.Grid}" Click="SwitchToGrid">
           <MenuItem.Icon>
             <Path Width="12" Height="12" Data="{StaticResource Icons.Grid}"/>
           </MenuItem.Icon>
         </MenuItem>
-        <MenuItem Header="{DynamicResource Text.ChangeDisplayMode.Tree}" Command="{Binding SwitchMode}" CommandParameter="{x:Static m:ChangeViewMode.Tree}">
+        <MenuItem Header="{DynamicResource Text.ChangeDisplayMode.Tree}" Click="SwitchToTree">
           <MenuItem.Icon>
             <Path Width="12" Height="12" Data="{StaticResource Icons.Tree}"/>
           </MenuItem.Icon>
@@ -31,13 +31,13 @@
     <Grid Width="14" Height="14" HorizontalAlignment="Center" VerticalAlignment="Center">
       <Path Width="14" Height="14"
             Data="{StaticResource Icons.List}"
-            IsVisible="{Binding ViewMode, Converter={x:Static ObjectConverters.Equal}, ConverterParameter={x:Static m:ChangeViewMode.List}}"/>
+            IsVisible="{Binding #ThisControl.ViewMode, Converter={x:Static ObjectConverters.Equal}, ConverterParameter={x:Static m:ChangeViewMode.List}}"/>
       <Path Width="14" Height="14"
             Data="{StaticResource Icons.Grid}"
-            IsVisible="{Binding ViewMode, Converter={x:Static ObjectConverters.Equal}, ConverterParameter={x:Static m:ChangeViewMode.Grid}}"/>
+            IsVisible="{Binding #ThisControl.ViewMode, Converter={x:Static ObjectConverters.Equal}, ConverterParameter={x:Static m:ChangeViewMode.Grid}}"/>
       <Path Width="14" Height="14"
             Data="{StaticResource Icons.Tree}"
-            IsVisible="{Binding ViewMode, Converter={x:Static ObjectConverters.Equal}, ConverterParameter={x:Static m:ChangeViewMode.Tree}}"/>
+            IsVisible="{Binding #ThisControl.ViewMode, Converter={x:Static ObjectConverters.Equal}, ConverterParameter={x:Static m:ChangeViewMode.Tree}}"/>
     </Grid>
   </Button>
 </UserControl>
diff --git a/src/Views/ChangeViewModeSwitcher.axaml.cs b/src/Views/ChangeViewModeSwitcher.axaml.cs
@@ -1,5 +1,6 @@
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Interactivity;
 
 namespace SourceGit.Views
 {
@@ -16,13 +17,25 @@ public Models.ChangeViewMode ViewMode
 
         public ChangeViewModeSwitcher()
         {
-            DataContext = this;
             InitializeComponent();
         }
 
-        public void SwitchMode(object param)
+        private void SwitchToList(object sender, RoutedEventArgs e)
         {
-            ViewMode = (Models.ChangeViewMode)param;
+            ViewMode = Models.ChangeViewMode.List;
+            e.Handled = true;
+        }
+
+        private void SwitchToGrid(object sender, RoutedEventArgs e)
+        {
+            ViewMode = Models.ChangeViewMode.Grid;
+            e.Handled = true;
+        }
+
+        private void SwitchToTree(object sender, RoutedEventArgs e)
+        {
+            ViewMode = Models.ChangeViewMode.Tree;
+            e.Handled = true;
         }
     }
 }
diff --git a/src/Views/StandaloneCommitMessageEditor.axaml.cs b/src/Views/StandaloneCommitMessageEditor.axaml.cs
@@ -9,18 +9,14 @@ public partial class StandaloneCommitMessageEditor : ChromelessWindow
     {
         public StandaloneCommitMessageEditor()
         {
-            _file = string.Empty;
-            DataContext = this;
             InitializeComponent();
         }
 
-        public StandaloneCommitMessageEditor(string file)
+        public void SetFile(string file)
         {
             _file = file;
-            DataContext = this;
-            InitializeComponent();
 
-            var content = File.ReadAllText(file).ReplaceLineEndings("\n");
+            var content = File.ReadAllText(file).ReplaceLineEndings("\n").Trim();
             var firstLineEnd = content.IndexOf('\n');
             if (firstLineEnd == -1)
             {
@@ -29,7 +25,7 @@ public StandaloneCommitMessageEditor(string file)
             else
             {
                 Editor.SubjectEditor.Text = content.Substring(0, firstLineEnd);
-                Editor.DescriptionEditor.Text = content.Substring(firstLineEnd + 1);
+                Editor.DescriptionEditor.Text = content.Substring(firstLineEnd + 1).Trim();
             }
         }
 
@@ -41,12 +37,16 @@ protected override void OnClosed(EventArgs e)
 
         private void SaveAndClose(object _1, RoutedEventArgs _2)
         {
-            File.WriteAllText(_file, Editor.Text);
-            _exitCode = 0;
+            if (!string.IsNullOrEmpty(_file))
+            {
+                File.WriteAllText(_file, Editor.Text);
+                _exitCode = 0;
+            }
+
             Close();
         }
 
-        private readonly string _file;
+        private string _file = string.Empty;
         private int _exitCode = -1;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using Avalonia;`
`2`	`2`	`using Avalonia.Controls;`
	`3`	`+using Avalonia.Interactivity;`
`3`	`4`
`4`	`5`	`namespace SourceGit.Views`
`5`	`6`	`{`
`@@ -16,13 +17,25 @@ public Models.ChangeViewMode ViewMode`
`16`	`17`
`17`	`18`	`public ChangeViewModeSwitcher()`
`18`	`19`	`{`
`19`		`- DataContext = this;`
`20`	`20`	`InitializeComponent();`
`21`	`21`	`}`
`22`	`22`
`23`		`- public void SwitchMode(object param)`
	`23`	`+ private void SwitchToList(object sender, RoutedEventArgs e)`
`24`	`24`	`{`
`25`		`- ViewMode = (Models.ChangeViewMode)param;`
	`25`	`+ ViewMode = Models.ChangeViewMode.List;`
	`26`	`+ e.Handled = true;`
	`27`	`+ }`
	`28`	`+`
	`29`	`+ private void SwitchToGrid(object sender, RoutedEventArgs e)`
	`30`	`+ {`
	`31`	`+ ViewMode = Models.ChangeViewMode.Grid;`
	`32`	`+ e.Handled = true;`
	`33`	`+ }`
	`34`	`+`
	`35`	`+ private void SwitchToTree(object sender, RoutedEventArgs e)`
	`36`	`+ {`
	`37`	`+ ViewMode = Models.ChangeViewMode.Tree;`
	`38`	`+ e.Handled = true;`
`26`	`39`	`}`
`27`	`40`	`}`
`28`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,18 +9,14 @@ public partial class StandaloneCommitMessageEditor : ChromelessWindow`
`9`	`9`	`{`
`10`	`10`	`public StandaloneCommitMessageEditor()`
`11`	`11`	`{`
`12`		`- _file = string.Empty;`
`13`		`- DataContext = this;`
`14`	`12`	`InitializeComponent();`
`15`	`13`	`}`
`16`	`14`
`17`		`- public StandaloneCommitMessageEditor(string file)`
	`15`	`+ public void SetFile(string file)`
`18`	`16`	`{`
`19`	`17`	`_file = file;`
`20`		`- DataContext = this;`
`21`		`- InitializeComponent();`
`22`	`18`
`23`		`- var content = File.ReadAllText(file).ReplaceLineEndings("\n");`
	`19`	`+ var content = File.ReadAllText(file).ReplaceLineEndings("\n").Trim();`
`24`	`20`	`var firstLineEnd = content.IndexOf('\n');`
`25`	`21`	`if (firstLineEnd == -1)`
`26`	`22`	`{`
`@@ -29,7 +25,7 @@ public StandaloneCommitMessageEditor(string file)`
`29`	`25`	`else`
`30`	`26`	`{`
`31`	`27`	`Editor.SubjectEditor.Text = content.Substring(0, firstLineEnd);`
`32`		`- Editor.DescriptionEditor.Text = content.Substring(firstLineEnd + 1);`
	`28`	`+ Editor.DescriptionEditor.Text = content.Substring(firstLineEnd + 1).Trim();`
`33`	`29`	`}`
`34`	`30`	`}`
`35`	`31`
`@@ -41,12 +37,16 @@ protected override void OnClosed(EventArgs e)`
`41`	`37`
`42`	`38`	`private void SaveAndClose(object _1, RoutedEventArgs _2)`
`43`	`39`	`{`
`44`		`- File.WriteAllText(_file, Editor.Text);`
`45`		`- _exitCode = 0;`
	`40`	`+ if (!string.IsNullOrEmpty(_file))`
	`41`	`+ {`
	`42`	`+ File.WriteAllText(_file, Editor.Text);`
	`43`	`+ _exitCode = 0;`
	`44`	`+ }`
	`45`	`+`
`46`	`46`	`Close();`
`47`	`47`	`}`
`48`	`48`
`49`		`- private readonly string _file;`
	`49`	`+ private string _file = string.Empty;`
`50`	`50`	`private int _exitCode = -1;`
`51`	`51`	`}`
`52`	`52`	`}`