dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-05-22 20:54:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ux: adjust column width of commit hash and time after font size changed (#994)

Browse source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo 2025-03-06 11:50:22 +08:00
parent 78c0d8d334
commit aa0d4b4296
No known key found for this signature in database
2 changed files with 24 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/Views/Histories.axaml
View file

@ -24,7 +24,7 @@
</v:LayoutableGrid.ColumnDefinitions>
<Grid Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3">
<Grid RowDefinitions="24,*">
<Grid RowDefinitions="24,*" Grid.IsSharedSizeScope="True">
<!-- Headers -->
<Border Grid.Row="0"
Background="{DynamicResource Brush.Window}"
@ -35,8 +35,8 @@
<ColumnDefinition Width="*" MinWidth="100"/>
<ColumnDefinition Width="3"/>
<ColumnDefinition Width="{Binding #ThisControl.AuthorNameColumnWidth, Mode=TwoWay}" MinWidth="80"/>
<ColumnDefinition Width="100" MaxWidth="100" MinWidth="100"/>
<ColumnDefinition Width="170" MaxWidth="170" MinWidth="170"/>
<ColumnDefinition SharedSizeGroup="SHA"/>
<ColumnDefinition SharedSizeGroup="Time"/>
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" Classes="table_header" Text="{DynamicResource Text.Histories.Header.GraphAndSubject}" HorizontalAlignment="Center"/>
@ -121,8 +121,8 @@
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="{Binding #ThisControl.AuthorNameColumnWidth, Mode=OneWay}"/>
<ColumnDefinition Width="100" MaxWidth="100" MinWidth="100"/>
<ColumnDefinition Width="170" MaxWidth="170" MinWidth="170"/>
<ColumnDefinition SharedSizeGroup="SHA" Width="Auto" MinWidth="100"/>
<ColumnDefinition SharedSizeGroup="Time" Width="Auto" MinWidth="160"/>
</Grid.ColumnDefinitions>
<!-- Subject & REFS -->

22
src/Views/InteractiveRebase.axaml
View file

@ -59,7 +59,8 @@
SelectionMode="Single"
SelectedItem="{Binding SelectedItem, Mode=OneWayToSource}"
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
ScrollViewer.VerticalScrollBarVisibility="Auto">
ScrollViewer.VerticalScrollBarVisibility="Auto"
Grid.IsSharedSizeScope="True">
<v:InteractiveRebaseListBox.Styles>
<Style Selector="ListBoxItem">
<Setter Property="Margin" Value="0"/>
@ -78,7 +79,19 @@
<v:InteractiveRebaseListBox.ItemTemplate>
<DataTemplate DataType="vm:InteractiveRebaseItem">
<Grid Height="26" Margin="8,0" ColumnDefinitions="16,110,*,32,108,96,170,32,32" ClipToBounds="True">
<Grid Height="26" Margin="8,0" ClipToBounds="True">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="16"/>
<ColumnDefinition Width="110"/>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="32"/>
<ColumnDefinition Width="108"/>
<ColumnDefinition Width="Auto" SharedSizeGroup="CommitHashColumn"/>
<ColumnDefinition Width="Auto" SharedSizeGroup="CommitTimeColumn"/>
<ColumnDefinition Width="32"/>
<ColumnDefinition Width="32"/>
</Grid.ColumnDefinitions>
<!-- Drag & Drop Anchor -->
<Border Grid.Column="0" Background="Transparent"
Loaded="OnSetupRowHeaderDragDrop"
@ -210,7 +223,10 @@
<!-- Commit Time -->
<Border Grid.Column="6">
<TextBlock Classes="primary" Text="{Binding Commit.CommitterTimeStr}" HorizontalAlignment="Center"/>
<TextBlock Classes="primary"
Margin="16,0,8,0"
Text="{Binding Commit.CommitterTimeStr}"
HorizontalAlignment="Center"/>
</Border>
<!-- MoveUp Button -->