Skip to content

Commit aa0d4b4

Browse files
committed
ux: adjust column width of commit hash and time after font size changed (#994)
Signed-off-by: leo <[email protected]>
1 parent 78c0d8d commit aa0d4b4

File tree

2 files changed

+24
-8
lines changed

2 files changed

+24
-8
lines changed

src/Views/Histories.axaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</v:LayoutableGrid.ColumnDefinitions>
2525

2626
<Grid Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3">
27-
<Grid RowDefinitions="24,*">
27+
<Grid RowDefinitions="24,*" Grid.IsSharedSizeScope="True">
2828
<!-- Headers -->
2929
<Border Grid.Row="0"
3030
Background="{DynamicResource Brush.Window}"
@@ -35,8 +35,8 @@
3535
<ColumnDefinition Width="*" MinWidth="100"/>
3636
<ColumnDefinition Width="3"/>
3737
<ColumnDefinition Width="{Binding #ThisControl.AuthorNameColumnWidth, Mode=TwoWay}" MinWidth="80"/>
38-
<ColumnDefinition Width="100" MaxWidth="100" MinWidth="100"/>
39-
<ColumnDefinition Width="170" MaxWidth="170" MinWidth="170"/>
38+
<ColumnDefinition SharedSizeGroup="SHA"/>
39+
<ColumnDefinition SharedSizeGroup="Time"/>
4040
</Grid.ColumnDefinitions>
4141

4242
<TextBlock Grid.Column="0" Classes="table_header" Text="{DynamicResource Text.Histories.Header.GraphAndSubject}" HorizontalAlignment="Center"/>
@@ -121,8 +121,8 @@
121121
<Grid.ColumnDefinitions>
122122
<ColumnDefinition Width="*"/>
123123
<ColumnDefinition Width="{Binding #ThisControl.AuthorNameColumnWidth, Mode=OneWay}"/>
124-
<ColumnDefinition Width="100" MaxWidth="100" MinWidth="100"/>
125-
<ColumnDefinition Width="170" MaxWidth="170" MinWidth="170"/>
124+
<ColumnDefinition SharedSizeGroup="SHA" Width="Auto" MinWidth="100"/>
125+
<ColumnDefinition SharedSizeGroup="Time" Width="Auto" MinWidth="160"/>
126126
</Grid.ColumnDefinitions>
127127

128128
<!-- Subject & REFS -->

src/Views/InteractiveRebase.axaml

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@
5959
SelectionMode="Single"
6060
SelectedItem="{Binding SelectedItem, Mode=OneWayToSource}"
6161
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
62-
ScrollViewer.VerticalScrollBarVisibility="Auto">
62+
ScrollViewer.VerticalScrollBarVisibility="Auto"
63+
Grid.IsSharedSizeScope="True">
6364
<v:InteractiveRebaseListBox.Styles>
6465
<Style Selector="ListBoxItem">
6566
<Setter Property="Margin" Value="0"/>
@@ -78,7 +79,19 @@
7879

7980
<v:InteractiveRebaseListBox.ItemTemplate>
8081
<DataTemplate DataType="vm:InteractiveRebaseItem">
81-
<Grid Height="26" Margin="8,0" ColumnDefinitions="16,110,*,32,108,96,170,32,32" ClipToBounds="True">
82+
<Grid Height="26" Margin="8,0" ClipToBounds="True">
83+
<Grid.ColumnDefinitions>
84+
<ColumnDefinition Width="16"/>
85+
<ColumnDefinition Width="110"/>
86+
<ColumnDefinition Width="*"/>
87+
<ColumnDefinition Width="32"/>
88+
<ColumnDefinition Width="108"/>
89+
<ColumnDefinition Width="Auto" SharedSizeGroup="CommitHashColumn"/>
90+
<ColumnDefinition Width="Auto" SharedSizeGroup="CommitTimeColumn"/>
91+
<ColumnDefinition Width="32"/>
92+
<ColumnDefinition Width="32"/>
93+
</Grid.ColumnDefinitions>
94+
8295
<!-- Drag & Drop Anchor -->
8396
<Border Grid.Column="0" Background="Transparent"
8497
Loaded="OnSetupRowHeaderDragDrop"
@@ -210,7 +223,10 @@
210223

211224
<!-- Commit Time -->
212225
<Border Grid.Column="6">
213-
<TextBlock Classes="primary" Text="{Binding Commit.CommitterTimeStr}" HorizontalAlignment="Center"/>
226+
<TextBlock Classes="primary"
227+
Margin="16,0,8,0"
228+
Text="{Binding Commit.CommitterTimeStr}"
229+
HorizontalAlignment="Center"/>
214230
</Border>
215231

216232
<!-- MoveUp Button -->

0 commit comments

Comments
 (0)