Skip to content

Commit 6ea00a3

Browse files
committed
refactor: remove move up/down button since we support to drag & drop items
Signed-off-by: leo <longshuang@msn.cn>
1 parent e5bd166 commit 6ea00a3

File tree

2 files changed

+3
-45
lines changed

2 files changed

+3
-45
lines changed

src/Views/InteractiveRebase.axaml

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,6 @@
8888
<ColumnDefinition Width="108"/>
8989
<ColumnDefinition Width="Auto" SharedSizeGroup="CommitHashColumn"/>
9090
<ColumnDefinition Width="Auto" SharedSizeGroup="CommitTimeColumn"/>
91-
<ColumnDefinition Width="32"/>
92-
<ColumnDefinition Width="32"/>
9391
</Grid.ColumnDefinitions>
9492

9593
<!-- Drag & Drop Anchor -->
@@ -191,7 +189,7 @@
191189
<Grid Grid.Column="2" ColumnDefinitions="Auto,*" ClipToBounds="True">
192190
<Button Grid.Column="0"
193191
Classes="icon_button"
194-
Margin="0,0,8,0"
192+
Margin="0,0,6,0" Padding="0"
195193
IsVisible="{Binding Action, Converter={x:Static c:InteractiveRebaseActionConverters.CanEditMessage}}"
196194
Click="OnOpenCommitMessageEditor">
197195
<Path Width="14" Height="14" Margin="0,4,0,0" Data="{StaticResource Icons.Edit}"/>
@@ -214,27 +212,15 @@
214212
<!-- Commit SHA -->
215213
<Border Grid.Column="5" ClipToBounds="True">
216214
<TextBlock Classes="primary"
217-
Text="{Binding Commit.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"
218-
HorizontalAlignment="Center"/>
215+
Text="{Binding Commit.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"/>
219216
</Border>
220217

221218
<!-- Commit Time -->
222219
<Border Grid.Column="6">
223220
<TextBlock Classes="primary"
224221
Margin="16,0,8,0"
225-
Text="{Binding Commit.CommitterTimeStr}"
226-
HorizontalAlignment="Center"/>
222+
Text="{Binding Commit.CommitterTimeStr}"/>
227223
</Border>
228-
229-
<!-- MoveUp Button -->
230-
<Button Grid.Column="7" Classes="icon_button" Click="OnMoveItemUp" ToolTip.Tip="Alt+Up">
231-
<Path Width="14" Height="14" Margin="0,4,0,0" Data="{StaticResource Icons.Up}"/>
232-
</Button>
233-
234-
<!-- MoveDown Button -->
235-
<Button Grid.Column="8" Classes="icon_button" Click="OnMoveItemDown" ToolTip.Tip="Alt+Down">
236-
<Path Width="14" Height="14" Margin="0,4,0,0" Data="{StaticResource Icons.Down}"/>
237-
</Button>
238224
</Grid>
239225
</DataTemplate>
240226
</v:InteractiveRebaseListBox.ItemTemplate>

src/Views/InteractiveRebase.axaml.cs

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,6 @@ protected override void OnKeyDown(KeyEventArgs e)
5757
vm.ChangeAction(item, Models.InteractiveRebaseAction.Drop);
5858
e.Handled = true;
5959
}
60-
else if (e.KeyModifiers == KeyModifiers.Alt && e.Key == Key.Up)
61-
{
62-
vm.MoveItemUp(item);
63-
e.Handled = true;
64-
}
65-
else if (e.KeyModifiers == KeyModifiers.Alt && e.Key == Key.Down)
66-
{
67-
vm.MoveItemDown(item);
68-
e.Handled = true;
69-
}
7060
else
7161
{
7262
base.OnKeyDown(e);
@@ -136,24 +126,6 @@ private void OnRowHeaderDragOver(object sender, DragEventArgs e)
136126
}
137127
}
138128

139-
private void OnMoveItemUp(object sender, RoutedEventArgs e)
140-
{
141-
if (sender is Control control && DataContext is ViewModels.InteractiveRebase vm)
142-
{
143-
vm.MoveItemUp(control.DataContext as ViewModels.InteractiveRebaseItem);
144-
e.Handled = true;
145-
}
146-
}
147-
148-
private void OnMoveItemDown(object sender, RoutedEventArgs e)
149-
{
150-
if (sender is Control control && DataContext is ViewModels.InteractiveRebase vm)
151-
{
152-
vm.MoveItemDown(control.DataContext as ViewModels.InteractiveRebaseItem);
153-
e.Handled = true;
154-
}
155-
}
156-
157129
private void OnChangeRebaseAction(object sender, RoutedEventArgs e)
158130
{
159131
if (DataContext is ViewModels.InteractiveRebase vm &&

0 commit comments

Comments
 (0)