Xcode 14 modernization #3
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -82,6 +82,8 @@ typedef NS_ENUM(NSUInteger, _SRRecorderControlButtonTag) | |
| _SRRecorderControlMainButtonTag = 2 | ||
| }; | ||
|
|
||
| @interface SRRecorderControl () <NSAccessibility, NSViewToolTipOwner> | ||
| @end | ||
|
|
||
| @implementation SRRecorderControl | ||
| { | ||
|
|
@@ -146,6 +148,10 @@ - (void)_initInternalState | |
| _shapeYRadious = _SRRecorderControlYosemiteShapeYRadius; | ||
| } | ||
|
|
||
| [self setAccessibilityElement:YES]; | ||
| [self setAccessibilityRole:NSAccessibilityButtonRole]; | ||
| [self setAccessibilityEnabled:YES]; | ||
|
|
||
| [self setToolTip:SRLoc(@"Click to record shortcut")]; | ||
| [self updateTrackingAreas]; | ||
| } | ||
|
|
@@ -193,6 +199,8 @@ - (void)setEnabled:(BOOL)newEnabled | |
| // Focus ring is only drawn when view is enabled | ||
| if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_6) | ||
| [self noteFocusRingMaskChanged]; | ||
|
|
||
| [self setAccessibilityEnabled:_enabled]; | ||
| } | ||
|
|
||
| - (void)setObjectValue:(NSDictionary *)newObjectValue | ||
|
|
@@ -422,6 +430,11 @@ - (NSString *)accessibilityLabel | |
| return label; | ||
| } | ||
|
|
||
| - (NSString *)accessibilityTitle | ||
|
There was a problem hiding this comment. Does this duplication resolve a specific issue? There was a problem hiding this comment. (label is intended to be a clean replacement for title, but there have definitely been bugs historically) There was a problem hiding this comment. That was done in 349fa68 - IIRC VoiceOver reads the title of the button but we were only providing the label. |
||
| { | ||
| return [self accessibilityLabel]; | ||
| } | ||
|
|
||
| - (NSString *)stringValue | ||
| { | ||
| if (![self.objectValue count]) | ||
|
|
@@ -845,102 +858,47 @@ - (id)value | |
|
|
||
| #pragma mark NSAccessibility | ||
|
|
||
| - (BOOL)accessibilityPerformPress | ||
| { | ||
| [self beginRecording]; | ||
|
|
||
| return YES; | ||
| } | ||
|
|
||
| - (BOOL)accessibilityPerformCancel | ||
| { | ||
| if (self.isRecording) { | ||
| [self endRecording]; | ||
| } | ||
|
|
||
| return self.isRecording; | ||
| } | ||
|
|
||
| - (BOOL)accessibilityPerformDelete | ||
| { | ||
| if (self.isRecording) { | ||
| [self clearAndEndRecording]; | ||
| } | ||
|
|
||
| return self.isRecording; | ||
| } | ||
|
|
||
| - (BOOL)isAccessibilitySelectorAllowed:(SEL)selector | ||
| { | ||
| // This method asks us which accessibility selector are allowed. We need | ||
| // to limit some of these based on whether we're recording. However, all | ||
| // other selectors should return the default result (otherwise we might | ||
| // block `accessibilityLabel`). | ||
|
|
||
| if (selector == @selector(accessibilityPerformPress)) { | ||
| return self.enabled; | ||
| } else if (selector == @selector(accessibilityPerformCancel)) { | ||
| return self.isRecording; | ||
| } else if (selector == @selector(accessibilityPerformDelete)) { | ||
| return self.isRecording; | ||
| } | ||
|
|
||
| return YES; | ||
| } | ||
|
|
||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's unusual to add
NSAccessibilityconformance like this. What are you indicating?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You might want
NSAccessibilityButtonwhich will populate the role for you