Skip to content

Commit 792e61b

Browse files
committed
ux: re-design the layout for Interactive Rebase window that tries to fix issue #1037
Signed-off-by: leo <[email protected]>
1 parent e884f27 commit 792e61b

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

src/Views/InteractiveRebase.axaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,25 +60,25 @@
6060
SelectedItem="{Binding SelectedItem, Mode=OneWayToSource}"
6161
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
6262
ScrollViewer.VerticalScrollBarVisibility="Auto">
63-
<ListBox.Styles>
63+
<v:InteractiveRebaseListBox.Styles>
6464
<Style Selector="ListBoxItem">
6565
<Setter Property="Margin" Value="0"/>
6666
<Setter Property="Padding" Value="0"/>
6767
<Setter Property="Height" Value="28"/>
6868
<Setter Property="HorizontalAlignment" Value="Stretch"/>
6969
<Setter Property="HorizontalContentAlignment" Value="Stretch"/>
7070
</Style>
71-
</ListBox.Styles>
71+
</v:InteractiveRebaseListBox.Styles>
7272

73-
<ListBox.ItemsPanel>
73+
<v:InteractiveRebaseListBox.ItemsPanel>
7474
<ItemsPanelTemplate>
7575
<VirtualizingStackPanel Orientation="Vertical"/>
7676
</ItemsPanelTemplate>
77-
</ListBox.ItemsPanel>
77+
</v:InteractiveRebaseListBox.ItemsPanel>
7878

79-
<ListBox.ItemTemplate>
79+
<v:InteractiveRebaseListBox.ItemTemplate>
8080
<DataTemplate DataType="vm:InteractiveRebaseItem">
81-
<Grid Height="26" Margin="8,0" ColumnDefinitions="16,110,*,32,108,96,Auto,32,32" ClipToBounds="True">
81+
<Grid Height="26" Margin="8,0" ColumnDefinitions="16,110,*,32,108,96,170,32,32" ClipToBounds="True">
8282
<!-- Drag & Drop Anchor -->
8383
<Border Grid.Column="0" Background="Transparent"
8484
Loaded="OnSetupRowHeaderDragDrop"
@@ -210,8 +210,8 @@
210210

211211
<!-- Commit Time -->
212212
<Border Grid.Column="6">
213-
<TextBlock Classes="primary" Text="{Binding Commit.CommitterTimeStr}" Margin="8,0"/>
214-
</Border>
213+
<TextBlock Classes="primary" Text="{Binding Commit.CommitterTimeStr}" HorizontalAlignment="Center"/>
214+
</Border>
215215

216216
<!-- MoveUp Button -->
217217
<Button Grid.Column="7" Classes="icon_button" Click="OnMoveItemUp" ToolTip.Tip="Alt+Up">
@@ -224,7 +224,7 @@
224224
</Button>
225225
</Grid>
226226
</DataTemplate>
227-
</ListBox.ItemTemplate>
227+
</v:InteractiveRebaseListBox.ItemTemplate>
228228
</v:InteractiveRebaseListBox>
229229

230230
<v:LoadingIcon Grid.Row="0" Width="48" Height="48" HorizontalAlignment="Center" VerticalAlignment="Center" IsVisible="{Binding IsLoading}"/>

0 commit comments

Comments
 (0)