@@ -370,6 +370,8 @@ private async void OnOpenCommitMessagePicker(object sender, RoutedEventArgs e)
370370 if ( sender is Button button && DataContext is ViewModels . WorkingCopy vm && ShowAdvancedOptions )
371371 {
372372 var repo = vm . Repository ;
373+ var foreground = this . FindResource ( "Brush.FG1" ) as IBrush ;
374+
373375 var menu = new ContextMenu ( ) ;
374376 menu . MaxWidth = 480 ;
375377
@@ -388,10 +390,13 @@ private async void OnOpenCommitMessagePicker(object sender, RoutedEventArgs e)
388390 {
389391 for ( int i = 0 ; i < templateCount ; i ++ )
390392 {
393+ var icon = App . CreateMenuIcon ( "Icons.Code" ) ;
394+ icon . Fill = foreground ;
395+
391396 var template = repo . Settings . CommitTemplates [ i ] ;
392397 var item = new MenuItem ( ) ;
393398 item . Header = App . Text ( "WorkingCopy.UseCommitTemplate" , template . Name ) ;
394- item . Icon = App . CreateMenuIcon ( "Icons.Code" ) ;
399+ item . Icon = icon ;
395400 item . Click += ( _ , ev ) =>
396401 {
397402 vm . ApplyCommitMessageTemplate ( template ) ;
@@ -414,9 +419,12 @@ private async void OnOpenCommitMessagePicker(object sender, RoutedEventArgs e)
414419 friendlyName = $ "~{ gitTemplate . AsSpan ( prefixLen ) } ";
415420 }
416421
422+ var icon = App . CreateMenuIcon ( "Icons.Code" ) ;
423+ icon . Fill = foreground ;
424+
417425 var gitTemplateItem = new MenuItem ( ) ;
418426 gitTemplateItem . Header = App . Text ( "WorkingCopy.UseCommitTemplate" , friendlyName ) ;
419- gitTemplateItem . Icon = App . CreateMenuIcon ( "Icons.Code" ) ;
427+ gitTemplateItem . Icon = icon ;
420428 gitTemplateItem . Click += ( _ , ev ) =>
421429 {
422430 if ( File . Exists ( gitTemplate ) )
@@ -451,9 +459,12 @@ private async void OnOpenCommitMessagePicker(object sender, RoutedEventArgs e)
451459 TextTrimming = TextTrimming . CharacterEllipsis
452460 } ;
453461
462+ var icon = App . CreateMenuIcon ( "Icons.Histories" ) ;
463+ icon . Fill = foreground ;
464+
454465 var item = new MenuItem ( ) ;
455466 item . Header = header ;
456- item . Icon = App . CreateMenuIcon ( "Icons.Histories" ) ;
467+ item . Icon = icon ;
457468 item . Click += ( _ , ev ) =>
458469 {
459470 vm . CommitMessage = dup ;
@@ -465,9 +476,12 @@ private async void OnOpenCommitMessagePicker(object sender, RoutedEventArgs e)
465476
466477 menu . Items . Add ( new MenuItem ( ) { Header = "-" } ) ;
467478
479+ var clearIcon = App . CreateMenuIcon ( "Icons.Clear" ) ;
480+ clearIcon . Fill = foreground ;
481+
468482 var clearHistoryItem = new MenuItem ( ) ;
469483 clearHistoryItem . Header = App . Text ( "WorkingCopy.ClearCommitHistories" ) ;
470- clearHistoryItem . Icon = App . CreateMenuIcon ( "Icons.Clear" ) ;
484+ clearHistoryItem . Icon = clearIcon ;
471485 clearHistoryItem . Click += async ( _ , ev ) =>
472486 {
473487 await vm . ClearCommitMessageHistoryAsync ( ) ;
0 commit comments