Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 400aaac

Browse files
fix: wrong column indentation on right side of Interactive Rebase window, for wide commit messages (#764)
1 parent 58eeeab commit 400aaac

File tree

1 file changed

+31
-24
lines changed

1 file changed

+31
-24
lines changed

‎src/Views/InteractiveRebase.axaml

Lines changed: 31 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,16 @@
7676

7777
<ListBox.ItemTemplate>
7878
<DataTemplate DataType="vm:InteractiveRebaseItem">
79-
<Grid ColumnDefinitions="16,110,*,40,100,96,156,32,32">
79+
<Grid ColumnDefinitions="16,110,*,140,96,156,32,32">
8080
<!-- Drag & Drop Anchor -->
8181
<Border Grid.Column="0" Background="Transparent"
82-
Margin="4,0,0,0"
8382
Loaded="OnSetupRowHeaderDragDrop"
8483
PointerPressed="OnRowHeaderPointerPressed">
85-
<Path Width="14" Height="14" Data="{StaticResource Icons.Move}" Fill="{DynamicResource Brush.FG2}"/>
84+
<Path Width="14" Height="14"
85+
Data="{StaticResource Icons.Move}"
86+
Fill="{DynamicResource Brush.FG2}"
87+
HorizontalAlignment="Center"
88+
VerticalAlignment="Center"/>
8689
</Border>
8790

8891
<!-- Action -->
@@ -170,8 +173,8 @@
170173
</Button>
171174

172175
<!-- Subject -->
173-
<StackPanel Grid.Column="2" Orientation="Horizontal" ClipToBounds="True">
174-
<Button Classes="icon_button" IsVisible="{Binding Action, Converter={x:Static c:InteractiveRebaseActionConverters.CanEditMessage}}">
176+
<Grid Grid.Column="2" ColumnDefinitions="Auto,*" ClipToBounds="True">
177+
<Button Grid.Column="0"Classes="icon_button"Margin="0,0,8,0" IsVisible="{Binding Action, Converter={x:Static c:InteractiveRebaseActionConverters.CanEditMessage}}">
175178
<Button.Flyout>
176179
<Flyout Placement="BottomEdgeAlignedLeft">
177180
<Panel Width="600" Height="120">
@@ -181,37 +184,41 @@
181184
</Button.Flyout>
182185
<Path Width="14" Height="14" Margin="0,4,0,0" Data="{StaticResource Icons.Edit}"/>
183186
</Button>
184-
<TextBlock Classes="primary" Text="{Binding Subject}" Margin="8,0,0,0"/>
185-
</StackPanel>
186-
187-
<!-- Avatar -->
188-
<v:Avatar Grid.Column="3"
189-
Width="16" Height="16"
190-
Margin="16,0,8,0"
191-
VerticalAlignment="Center"
192-
IsHitTestVisible="False"
193-
User="{Binding Commit.Author}"/>
187+
<TextBlock Grid.Column="1" Classes="primary" Margin="0,0,4,0" Text="{Binding Subject}"/>
188+
</Grid>
194189

195190
<!-- Author -->
196-
<Border Grid.Column="4" ClipToBounds="True">
197-
<TextBlock Classes="primary" Text="{Binding Commit.Author.Name}" HorizontalAlignment="Left"/>
198-
</Border>
191+
<Grid Grid.Column="3" ColumnDefinitions="Auto,*" Width="140" ClipToBounds="True">
192+
<v:Avatar Grid.Column="0"
193+
Width="16" Height="16"
194+
Margin="8,0,0,0"
195+
VerticalAlignment="Center"
196+
IsHitTestVisible="False"
197+
User="{Binding Commit.Author}"/>
198+
<TextBlock Grid.Column="1"
199+
Classes="primary"
200+
Margin="6,0,12,0"
201+
Text="{Binding Commit.Author.Name}"
202+
HorizontalAlignment="Left"/>
203+
</Grid>
199204

200205
<!-- Commit SHA -->
201-
<TextBlock Grid.Column="5" Classes="primary"
202-
Text="{Binding Commit.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"
203-
Margin="12,0"/>
206+
<Border Grid.Column="4" IsHitTestVisible="False" ClipToBounds="True">
207+
<TextBlock Classes="primary"
208+
Text="{Binding Commit.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"
209+
HorizontalAlignment="Center"/>
210+
</Border>
204211

205212
<!-- Commit Time -->
206-
<TextBlock Grid.Column="6" Classes="primary" Text="{Binding Commit.CommitterTimeStr}" Margin="8,0"/>
213+
<TextBlock Grid.Column="5" Classes="primary" Text="{Binding Commit.CommitterTimeStr}" Margin="8,0"/>
207214

208215
<!-- MoveUp Button -->
209-
<Button Grid.Column="7" Classes="icon_button" Click="OnMoveItemUp" ToolTip.Tip="Alt+Up">
216+
<Button Grid.Column="6" Classes="icon_button" Click="OnMoveItemUp" ToolTip.Tip="Alt+Up">
210217
<Path Width="14" Height="14" Margin="0,4,0,0" Data="{StaticResource Icons.Up}"/>
211218
</Button>
212219

213220
<!-- MoveDown Button -->
214-
<Button Grid.Column="8" Classes="icon_button" Click="OnMoveItemDown" ToolTip.Tip="Alt+Down">
221+
<Button Grid.Column="7" Classes="icon_button" Click="OnMoveItemDown" ToolTip.Tip="Alt+Down">
215222
<Path Width="14" Height="14" Margin="0,4,0,0" Data="{StaticResource Icons.Down}"/>
216223
</Button>
217224
</Grid>

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /