|
65 | 65 | <Setter Property="Margin" Value="0"/> |
66 | 66 | <Setter Property="Padding" Value="0"/> |
67 | 67 | <Setter Property="Height" Value="28"/> |
| 68 | + <Setter Property="HorizontalContentAlignment" Value="Stretch"/> |
68 | 69 | </Style> |
69 | 70 | </ListBox.Styles> |
70 | 71 |
|
|
76 | 77 |
|
77 | 78 | <ListBox.ItemTemplate> |
78 | 79 | <DataTemplate DataType="vm:InteractiveRebaseItem"> |
79 | | - <Grid ColumnDefinitions="16,110,*,140,96,156,32,32"> |
| 80 | + <Grid ColumnDefinitions="16,110,*,456"ClipToBounds="True"> |
80 | 81 | <!-- Drag & Drop Anchor --> |
81 | 82 | <Border Grid.Column="0" Background="Transparent" |
82 | 83 | Loaded="OnSetupRowHeaderDragDrop" |
|
187 | 188 | <TextBlock Grid.Column="1" Classes="primary" Margin="0,0,4,0" Text="{Binding Subject}"/> |
188 | 189 | </Grid> |
189 | 190 |
|
190 | | - <!-- Author --> |
191 | | - <Grid Grid.Column="3"ColumnDefinitions="Auto,*"Width="140"ClipToBounds="True"> |
| 191 | + <Grid Grid.Column="3"ColumnDefinitions="32,108,96,156,32,32"IsHitTestVisible="False"ClipToBounds="True"> |
| 192 | + <!-- Author Avatar --> |
192 | 193 | <v:Avatar Grid.Column="0" |
193 | 194 | Width="16" Height="16" |
194 | 195 | Margin="8,0,0,0" |
195 | 196 | VerticalAlignment="Center" |
196 | | - IsHitTestVisible="False" |
197 | 197 | User="{Binding Commit.Author}"/> |
| 198 | + |
| 199 | + <!-- Author Name --> |
198 | 200 | <TextBlock Grid.Column="1" |
199 | 201 | Classes="primary" |
| 202 | + MaxWidth="90" |
200 | 203 | Margin="6,0,12,0" |
201 | 204 | Text="{Binding Commit.Author.Name}" |
202 | 205 | HorizontalAlignment="Left"/> |
203 | | - </Grid> |
204 | | - |
205 | | - <!-- Commit SHA --> |
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> |
211 | 206 |
|
212 | | - <!-- Commit Time --> |
213 | | - <TextBlock Grid.Column="5" Classes="primary" Text="{Binding Commit.CommitterTimeStr}" Margin="8,0"/> |
| 207 | + <!-- Commit SHA --> |
| 208 | + <Border Grid.Column="2" ClipToBounds="True"> |
| 209 | + <TextBlock Classes="primary" |
| 210 | + Text="{Binding Commit.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" |
| 211 | + HorizontalAlignment="Center"/> |
| 212 | + </Border> |
214 | 213 |
|
215 | | - <!-- MoveUp Button --> |
216 | | - <Button Grid.Column="6" Classes="icon_button" Click="OnMoveItemUp" ToolTip.Tip="Alt+Up"> |
217 | | - <Path Width="14" Height="14" Margin="0,4,0,0" Data="{StaticResource Icons.Up}"/> |
218 | | - </Button> |
219 | | - |
220 | | - <!-- MoveDown Button --> |
221 | | - <Button Grid.Column="7" Classes="icon_button" Click="OnMoveItemDown" ToolTip.Tip="Alt+Down"> |
222 | | - <Path Width="14" Height="14" Margin="0,4,0,0" Data="{StaticResource Icons.Down}"/> |
223 | | - </Button> |
| 214 | + <!-- Commit Time --> |
| 215 | + <TextBlock Grid.Column="3" Classes="primary" Text="{Binding Commit.CommitterTimeStr}" Margin="8,0"/> |
| 216 | + |
| 217 | + <!-- MoveUp Button --> |
| 218 | + <Button Grid.Column="4" Classes="icon_button" Click="OnMoveItemUp" ToolTip.Tip="Alt+Up"> |
| 219 | + <Path Width="14" Height="14" Margin="0,4,0,0" Data="{StaticResource Icons.Up}"/> |
| 220 | + </Button> |
| 221 | + |
| 222 | + <!-- MoveDown Button --> |
| 223 | + <Button Grid.Column="5" Classes="icon_button" Click="OnMoveItemDown" ToolTip.Tip="Alt+Down"> |
| 224 | + <Path Width="14" Height="14" Margin="0,4,0,0" Data="{StaticResource Icons.Down}"/> |
| 225 | + </Button> |
| 226 | + </Grid> |
224 | 227 | </Grid> |
225 | 228 | </DataTemplate> |
226 | 229 | </ListBox.ItemTemplate> |
|
0 commit comments