code_style: remove unnecessary properties

Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo 2025-06-17 11:29:24 +08:00
parent dcdc52592c
commit e102e49f45
No known key found for this signature in database
4 changed files with 6 additions and 21 deletions

View file

@ -14,11 +14,6 @@ namespace SourceGit.ViewModels
{ {
public class Histories : ObservableObject, IDisposable public class Histories : ObservableObject, IDisposable
{ {
public Repository Repo
{
get => _repo;
}
public bool IsLoading public bool IsLoading
{ {
get => _isLoading; get => _isLoading;

View file

@ -34,7 +34,7 @@
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/> <ColumnDefinition Width="*"/>
<ColumnDefinition Width="3"/> <ColumnDefinition Width="3"/>
<ColumnDefinition Width="{Binding #ThisControl.AuthorNameColumnWidth, Mode=TwoWay}" MinWidth="80"/> <ColumnDefinition SharedSizeGroup="AuthorName" Width="{Binding Source={x:Static vm:Preferences.Instance}, Path=Layout.HistoriesAuthorColumnWidth, Mode=TwoWay}" MinWidth="80"/>
<ColumnDefinition SharedSizeGroup="SHA" MinWidth="100"/> <ColumnDefinition SharedSizeGroup="SHA" MinWidth="100"/>
<ColumnDefinition SharedSizeGroup="Time" MinWidth="160"/> <ColumnDefinition SharedSizeGroup="Time" MinWidth="160"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
@ -120,7 +120,7 @@
<Grid Height="26"> <Grid Height="26">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/> <ColumnDefinition Width="*"/>
<ColumnDefinition Width="{Binding #ThisControl.AuthorNameColumnWidth, Mode=OneWay}"/> <ColumnDefinition SharedSizeGroup="AuthorName" Width="Auto"/>
<ColumnDefinition SharedSizeGroup="SHA" Width="Auto"/> <ColumnDefinition SharedSizeGroup="SHA" Width="Auto"/>
<ColumnDefinition SharedSizeGroup="Time" Width="Auto"/> <ColumnDefinition SharedSizeGroup="Time" Width="Auto"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>

View file

@ -73,15 +73,6 @@ namespace SourceGit.Views
public partial class Histories : UserControl public partial class Histories : UserControl
{ {
public static readonly StyledProperty<GridLength> AuthorNameColumnWidthProperty =
AvaloniaProperty.Register<Histories, GridLength>(nameof(AuthorNameColumnWidth), new GridLength(120));
public GridLength AuthorNameColumnWidth
{
get => GetValue(AuthorNameColumnWidthProperty);
set => SetValue(AuthorNameColumnWidthProperty, value);
}
public static readonly StyledProperty<Models.Branch> CurrentBranchProperty = public static readonly StyledProperty<Models.Branch> CurrentBranchProperty =
AvaloniaProperty.Register<Histories, Models.Branch>(nameof(CurrentBranch)); AvaloniaProperty.Register<Histories, Models.Branch>(nameof(CurrentBranch));
@ -150,7 +141,7 @@ namespace SourceGit.Views
private void OnCommitListLayoutUpdated(object _1, EventArgs _2) private void OnCommitListLayoutUpdated(object _1, EventArgs _2)
{ {
var y = CommitListContainer.Scroll?.Offset.Y ?? 0; var y = CommitListContainer.Scroll?.Offset.Y ?? 0;
var authorNameColumnWidth = AuthorNameColumnWidth.Value; var authorNameColumnWidth = ViewModels.Preferences.Instance.Layout.HistoriesAuthorColumnWidth.Value;
if (y != _lastScrollY || authorNameColumnWidth != _lastAuthorNameColumnWidth) if (y != _lastScrollY || authorNameColumnWidth != _lastAuthorNameColumnWidth)
{ {
_lastScrollY = y; _lastScrollY = y;

View file

@ -829,11 +829,10 @@
<ContentControl Grid.Row="3" Content="{Binding SelectedView}"> <ContentControl Grid.Row="3" Content="{Binding SelectedView}">
<ContentControl.DataTemplates> <ContentControl.DataTemplates>
<DataTemplate DataType="vm:Histories"> <DataTemplate DataType="vm:Histories">
<v:Histories CurrentBranch="{Binding Repo.CurrentBranch}" <v:Histories CurrentBranch="{Binding $parent[v:Repository].((vm:Repository)DataContext).CurrentBranch}"
Bisect="{Binding Bisect}" Bisect="{Binding Bisect}"
AuthorNameColumnWidth="{Binding Source={x:Static vm:Preferences.Instance}, Path=Layout.HistoriesAuthorColumnWidth, Mode=TwoWay}" IssueTrackerRules="{Binding $parent[v:Repository].((vm:Repository)DataContext).Settings.IssueTrackerRules}"
IssueTrackerRules="{Binding Repo.Settings.IssueTrackerRules}" OnlyHighlightCurrentBranch="{Binding $parent[v:Repository].((vm:Repository)DataContext).OnlyHighlightCurrentBranchInHistories}"
OnlyHighlightCurrentBranch="{Binding Repo.OnlyHighlightCurrentBranchInHistories}"
NavigationId="{Binding NavigationId}"/> NavigationId="{Binding NavigationId}"/>
</DataTemplate> </DataTemplate>