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: re-design the layout for Interactive Rebase window that tries to fix issue #1037

Browse source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo 2025-03-04 09:46:02 +08:00
parent d4bcc60113
commit 5301a368e0
No known key found for this signature in database
1 changed files with 29 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

63
src/Views/InteractiveRebase.axaml
View file

@ -77,7 +77,7 @@
<ListBox.ItemTemplate> <ListBox.ItemTemplate>
<DataTemplate DataType="vm:InteractiveRebaseItem"> <DataTemplate DataType="vm:InteractiveRebaseItem">
<Grid ColumnDefinitions="16,110,*,Auto" Margin="8,0" ClipToBounds="True"> <Grid ColumnDefinitions="16,110,*,32,108,96,Auto,32,32" Margin="8,0" ClipToBounds="True">
<!-- Drag & Drop Anchor --> <!-- Drag & Drop Anchor -->
<Border Grid.Column="0" Background="Transparent" <Border Grid.Column="0" Background="Transparent"
Loaded="OnSetupRowHeaderDragDrop" Loaded="OnSetupRowHeaderDragDrop"
@ -188,44 +188,39 @@
<TextBlock Grid.Column="1" Classes="primary" Margin="0,0,4,0" Text="{Binding Subject}"/> <TextBlock Grid.Column="1" Classes="primary" Margin="0,0,4,0" Text="{Binding Subject}"/>
</Grid> </Grid>
<Grid Grid.Column="3" ColumnDefinitions="32,108,96,Auto,32,32" IsHitTestVisible="False" ClipToBounds="True"> <!-- Author Avatar -->
<!-- Author Avatar --> <v:Avatar Grid.Column="3"
<v:Avatar Grid.Column="0" Width="16" Height="16"
Width="16" Height="16" Margin="8,0,0,0"
Margin="8,0,0,0" VerticalAlignment="Center"
VerticalAlignment="Center" User="{Binding Commit.Author}"/>
User="{Binding Commit.Author}"/>
<!-- Author Name --> <!-- Author Name -->
<TextBlock Grid.Column="1" <Border Grid.Column="4" ClipToBounds="True">
Classes="primary" <TextBlock Classes="primary" Margin="6,0,12,0" Text="{Binding Commit.Author.Name}"/>
MaxWidth="90" </Border>
Margin="6,0,12,0"
Text="{Binding Commit.Author.Name}"
HorizontalAlignment="Left"/>
<!-- Commit SHA --> <!-- Commit SHA -->
<Border Grid.Column="2" ClipToBounds="True"> <Border Grid.Column="5" ClipToBounds="True">
<TextBlock Classes="primary" <TextBlock Classes="primary"
Text="{Binding Commit.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Text="{Binding Commit.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"
HorizontalAlignment="Center"/> HorizontalAlignment="Center"/>
</Border> </Border>
<!-- Commit Time --> <!-- Commit Time -->
<Border Grid.Column="3" ClipToBounds="True"> <Border Grid.Column="6">
<TextBlock Classes="primary" Text="{Binding Commit.CommitterTimeStr}" Margin="8,0"/> <TextBlock Classes="primary" Text="{Binding Commit.CommitterTimeStr}" Margin="8,0"/>
</Border> </Border>
<!-- MoveUp Button --> <!-- MoveUp Button -->
<Button Grid.Column="4" Classes="icon_button" Click="OnMoveItemUp" ToolTip.Tip="Alt+Up"> <Button Grid.Column="7" Classes="icon_button" Click="OnMoveItemUp" ToolTip.Tip="Alt+Up">
<Path Width="14" Height="14" Margin="0,4,0,0" Data="{StaticResource Icons.Up}"/> <Path Width="14" Height="14" Margin="0,4,0,0" Data="{StaticResource Icons.Up}"/>
</Button> </Button>
<!-- MoveDown Button --> <!-- MoveDown Button -->
<Button Grid.Column="5" Classes="icon_button" Click="OnMoveItemDown" ToolTip.Tip="Alt+Down"> <Button Grid.Column="8" Classes="icon_button" Click="OnMoveItemDown" ToolTip.Tip="Alt+Down">
<Path Width="14" Height="14" Margin="0,4,0,0" Data="{StaticResource Icons.Down}"/> <Path Width="14" Height="14" Margin="0,4,0,0" Data="{StaticResource Icons.Down}"/>
</Button> </Button>
</Grid>
</Grid> </Grid>
</DataTemplate> </DataTemplate>
</ListBox.ItemTemplate> </ListBox.ItemTemplate>