This repository was archived by the owner on Oct 4, 2021. It is now read-only.
File tree Expand file tree Collapse file tree 2 files changed +12
-9
lines changed
main/src/addins/MacPlatform/MainToolbar Expand file tree Collapse file tree 2 files changed +12
-9
lines changed Original file line number Diff line number Diff line change @@ -65,21 +65,26 @@ public override void KeyDown (NSEvent theEvent)
6565 {
6666 if ( theEvent . KeyCode == ( ushort ) KeyCodes . Tab ) {
6767 if ( theEvent . ModifierFlags == ( NSEventModifierMask ) KeyModifierFlag . None ) {
68- var success = buttonBars . FirstOrDefault ( ) . IncreaseFocusIndex ( ) ;
69- if ( success ) return ;
68+ if ( buttonBars . Count > 0 ) {
69+ var success = buttonBars [ 0 ] . IncreaseFocusIndex ( ) ;
70+ if ( success ) return ;
71+ }
7072 } else if ( theEvent . ModifierFlags == ( NSEventModifierMask ) KeyModifierFlag . Shift ) {
71- var success = buttonBars . FirstOrDefault ( ) . DecreaseFocusIndex ( ) ;
72- if ( success ) return ;
73+ if ( buttonBars . Count > 0 ) {
74+ var success = buttonBars [ 0 ] . DecreaseFocusIndex ( ) ;
75+ if ( success ) return ;
76+ }
7377 }
7478 } else if ( theEvent . KeyCode == ( ushort ) KeyCodes . Space || theEvent . KeyCode == ( ushort ) KeyCodes . Enter ) {
75- var buttonBar = buttonBars . FirstOrDefault ( ) ;
76- buttonBar . ExecuteFocused ( ) ;
79+ if ( buttonBars . Count > 0 ) {
80+ var buttonBar = buttonBars [ 0 ] ;
81+ buttonBar . ExecuteFocused ( ) ;
82+ }
7783 }
7884
7985 base . KeyDown ( theEvent ) ;
8086 }
8187
82-
8388 public override bool AcceptsFirstResponder ( ) => buttonBars . Any ( ) ;
8489
8590 public override bool BecomeFirstResponder ( )
Original file line number Diff line number Diff line change @@ -236,9 +236,7 @@ public void RebuildToolbar (IEnumerable<ButtonBarGroup> groups)
236236 } ;
237237 buttonBars . Add ( bar ) ;
238238 }
239-
240239 awesomeBar . ButtonBarContainer . ButtonBars = buttonBars ;
241-
242240 }
243241
244242 public bool RunButtonSensitivity {
You can’t perform that action at this time.
0 commit comments