fix deprecations

This commit is contained in:
Qiu Yuzhou
2021-06-24 01:25:13 +08:00
parent bb799bbf0b
commit f9ee656ff5
2 changed files with 6 additions and 6 deletions
+4 -4
View File
@@ -13,8 +13,8 @@
// Enable Key Shortcuts
// http://stackoverflow.com/questions/970707/cocoa-keyboard-shortcuts-in-dialog-without-an-edit-menu
- (void) sendEvent:(NSEvent *)event {
if ([event type] == NSKeyDown) {
if (([event modifierFlags] & NSDeviceIndependentModifierFlagsMask) == NSCommandKeyMask) {
if ([event type] == NSEventTypeKeyDown ) {
if (([event modifierFlags] & NSEventModifierFlagDeviceIndependentFlagsMask) == NSEventModifierFlagCommand) {
if ([[event charactersIgnoringModifiers] isEqualToString:@"x"]) {
if ([self sendAction:@selector(cut:) to:nil from:self])
return;
@@ -36,7 +36,7 @@
return;
}
}
else if (([event modifierFlags] & NSDeviceIndependentModifierFlagsMask) == (NSCommandKeyMask | NSShiftKeyMask)) {
else if (([event modifierFlags] & NSEventModifierFlagDeviceIndependentFlagsMask) == (NSEventModifierFlagCommand | NSEventModifierFlagShift)) {
if ([[event charactersIgnoringModifiers] isEqualToString:@"Z"]) {
if ([self sendAction:@selector(redo) to:nil from:self])
return;
@@ -46,4 +46,4 @@
[super sendEvent:event];
}
@end
@end
+2 -2
View File
@@ -89,8 +89,8 @@
}
- (void)flagsChanged:(NSEvent *)event {
NSUInteger modifiers = event.modifierFlags & NSDeviceIndependentModifierFlagsMask;
if (modifiers & NSAlternateKeyMask) {
NSUInteger modifiers = event.modifierFlags & NSEventModifierFlagDeviceIndependentFlagsMask;
if (modifiers & NSEventModifierFlagOption) {
[self setQRCode:self.legacyQRCode withOverlayText:@"Legacy"];
} else {
[self setQRCode:self.qrCode withOverlayText:@"SIP002"];