Revision: 14387
http://sourceforge.net/p/skim-app/code/14387
Author: hofman
Date: 2024-07-18 22:50:01 +0000 (Thu, 18 Jul 2024)
Log Message:
-----------
Use device independent modifiers without numpad or function for
standardModifierFlags
Modified Paths:
--------------
trunk/NSEvent_SKExtensions.m
Modified: trunk/NSEvent_SKExtensions.m
===================================================================
--- trunk/NSEvent_SKExtensions.m 2024-07-18 22:45:21 UTC (rev 14386)
+++ trunk/NSEvent_SKExtensions.m 2024-07-18 22:50:01 UTC (rev 14387)
@@ -38,14 +38,12 @@
#import "NSEvent_SKExtensions.h"
-#define SKStandardModifierFlagsMask (NSEventModifierFlagCommand |
NSEventModifierFlagOption | NSEventModifierFlagShift |
NSEventModifierFlagControl)
-
@implementation NSEvent (SKExtensions)
static NSPointingDeviceType currentPointingDeviceType =
NSPointingDeviceTypeUnknown;
+ (NSUInteger)standardModifierFlags {
- return [self modifierFlags] & SKStandardModifierFlagsMask;
+ return [self modifierFlags] &
NSEventModifierFlagDeviceIndependentFlagsMask & ~(NSEventModifierFlagNumericPad
| NSEventModifierFlagFunction);
}
- (NSUInteger)deviceIndependentModifierFlags {
@@ -53,7 +51,7 @@
}
- (NSUInteger)standardModifierFlags {
- return [self modifierFlags] & SKStandardModifierFlagsMask;
+ return [self modifierFlags] &
NSEventModifierFlagDeviceIndependentFlagsMask & ~(NSEventModifierFlagNumericPad
| NSEventModifierFlagFunction);
}
+ (NSPointingDeviceType)currentPointingDeviceType {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
