Merge pull request #9168 from mono/backport-pr-9150-to-release-8.4

[release-8.4] Keyboard focus  not going to "Pause Execution" button

Author: sevoku

main/src/addins/MacPlatform/MainToolbar/AwesomeBar.cs

@@ -64,6 +64,11 @@ public AwesomeBar ()
 
 			StatusBar.SearchBar = SearchBar;
 
+			RunButton.NextKeyView = SelectorView;
+			SelectorView.NextKeyView = ButtonBarContainer;
+			ButtonBarContainer.NextKeyView = StatusBar;
+			StatusBar.NextKeyView = SearchBar;
+
 			Ide.Gui.Styles.Changed +=  (o, e) => UpdateLayout ();
 		}
 

main/src/addins/MacPlatform/MainToolbar/ButtonBar.cs

@@ -240,6 +240,7 @@ public bool HasFocus {
 				RebuildSegments ();
 			}
 		}
+
 		uint focusedSegment = 0; 
 		public bool IncreaseFocusIndex()
 		{
@@ -254,6 +255,16 @@ public bool IncreaseFocusIndex()
 			};
 			return result;
 		}
+
+		public bool DecreaseFocusIndex ()
+		{
+			if (focusedSegment == 0)
+				return false;
+			focusedSegment--;
+			RebuildSegments ();
+			return true;
+		}
+
 		public event EventHandler ResizeRequested;
 	}
 }

main/src/addins/MacPlatform/MainToolbar/ButtonBarContainer.cs

@@ -25,10 +25,11 @@
 // THE SOFTWARE.
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using AppKit;
 using CoreGraphics;
 using MonoDevelop.Ide;
-using System.Linq;
+using MonoDevelop.Components.Mac;
 
 namespace MonoDevelop.MacIntegration.MainToolbar
 {
@@ -61,21 +62,30 @@ internal List<ButtonBar> ButtonBars {
 		}
 
 		public override void KeyDown (NSEvent theEvent)
-        {
-            if (theEvent.Characters == "\t" && NextKeyView != null) {
-				var success = buttonBars.FirstOrDefault ().IncreaseFocusIndex(); //TODO
-				if(!success)
-					Window.MakeFirstResponder (NextKeyView);
-				return; 
-            }
-
-			if (theEvent.Characters == " " && NextKeyView != null) {
-				var buttonBar = buttonBars.FirstOrDefault ();
-				buttonBar.ExecuteFocused ();
+		{
+			if (theEvent.KeyCode == (ushort)KeyCodes.Tab) {
+				if (theEvent.ModifierFlags == (NSEventModifierMask)KeyModifierFlag.None) {
+					if (buttonBars.Count > 0) {
+						var success = buttonBars[0].IncreaseFocusIndex ();
+						if (success) return;
+					}
+				} else if (theEvent.ModifierFlags == (NSEventModifierMask)KeyModifierFlag.Shift) {
+					if (buttonBars.Count > 0) {
+						var success = buttonBars[0].DecreaseFocusIndex ();
+						if (success) return;
+					}
+				}
+			} else if (theEvent.KeyCode == (ushort)KeyCodes.Space || theEvent.KeyCode == (ushort)KeyCodes.Enter) {
+					if (buttonBars.Count > 0) {
+						var buttonBar = buttonBars[0];
+						buttonBar.ExecuteFocused ();
+					}
 			}
 
-			base.KeyDown (theEvent);
-        }
+		   	base.KeyDown (theEvent);
+		}
+		
+		public override bool AcceptsFirstResponder () => buttonBars.Any ();
 
 		public override bool BecomeFirstResponder ()
 		{

main/src/addins/MacPlatform/MainToolbar/MainToolbar.cs

@@ -236,7 +236,6 @@ public void RebuildToolbar (IEnumerable<ButtonBarGroup> groups)
 				};
 				buttonBars.Add (bar);
 			}
-
 			awesomeBar.ButtonBarContainer.ButtonBars = buttonBars;
 		}