Skip to content

Commit d098f4e

Browse files
committed
ux: toolbar buttons in commit message edit box (#2003)
- Change button's `Width` from 24px to 28px - Disable button while its context menu is opening Signed-off-by: leo <longshuang@msn.cn>
1 parent d9dd2c1 commit d098f4e

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

src/Views/CommitMessageToolBox.axaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<Grid ColumnDefinitions="Auto,Auto,Auto,*" Margin="0,4">
3838
<Button Grid.Column="0"
3939
Classes="icon_button"
40-
Width="24"
40+
Width="28"
4141
Margin="0,0,4,0" Padding="0"
4242
Click="OnOpenCommitMessagePicker"
4343
IsVisible="{Binding #ThisControl.ShowAdvancedOptions}"
@@ -47,7 +47,7 @@
4747

4848
<Button Grid.Column="1"
4949
Classes="icon_button"
50-
Width="24"
50+
Width="28"
5151
Margin="0,0,4,0" Padding="0"
5252
Click="OnOpenOpenAIHelper"
5353
IsVisible="{Binding #ThisControl.ShowAdvancedOptions}"
@@ -57,8 +57,8 @@
5757

5858
<Button Grid.Column="2"
5959
Classes="icon_button"
60-
Width="24"
61-
Margin="0,0,4,0" Padding="0"
60+
Width="28"
61+
Margin="0" Padding="0"
6262
Click="OnOpenConventionalCommitHelper"
6363
ToolTip.Tip="{DynamicResource Text.ConventionalCommit}">
6464
<Path Width="13" Height="13" Margin="0,1,0,0" Data="{StaticResource Icons.CommitMessageGenerator}"/>

src/Views/CommitMessageToolBox.axaml.cs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,9 @@ private async void OnOpenCommitMessagePicker(object sender, RoutedEventArgs e)
477477
menu.Items.Add(clearHistoryItem);
478478
}
479479

480+
button.IsEnabled = false;
480481
menu.Placement = PlacementMode.TopEdgeAlignedLeft;
482+
menu.Closed += (o, ev) => button.IsEnabled = true;
481483
menu.Open(button);
482484
}
483485

@@ -486,7 +488,7 @@ private async void OnOpenCommitMessagePicker(object sender, RoutedEventArgs e)
486488

487489
private async void OnOpenOpenAIHelper(object sender, RoutedEventArgs e)
488490
{
489-
if (DataContext is ViewModels.WorkingCopy vm && sender is Control control && ShowAdvancedOptions)
491+
if (DataContext is ViewModels.WorkingCopy vm && sender is Button button && ShowAdvancedOptions)
490492
{
491493
var repo = vm.Repository;
492494

@@ -509,7 +511,7 @@ private async void OnOpenOpenAIHelper(object sender, RoutedEventArgs e)
509511
return;
510512
}
511513

512-
var menu = new ContextMenu() { Placement = PlacementMode.TopEdgeAlignedLeft };
514+
var menu = new ContextMenu();
513515
foreach (var service in services)
514516
{
515517
var dup = service;
@@ -523,7 +525,11 @@ private async void OnOpenOpenAIHelper(object sender, RoutedEventArgs e)
523525

524526
menu.Items.Add(item);
525527
}
526-
menu.Open(control);
528+
529+
button.IsEnabled = false;
530+
menu.Placement = PlacementMode.TopEdgeAlignedLeft;
531+
menu.Closed += (o, ev) => button.IsEnabled = true;
532+
menu.Open(button);
527533
}
528534

529535
e.Handled = true;

0 commit comments

Comments
 (0)