Revision: 15832
http://sourceforge.net/p/skim-app/code/15832
Author: hofman
Date: 2025-11-25 17:20:48 +0000 (Tue, 25 Nov 2025)
Log Message:
-----------
use NSEventModifierFlags
Modified Paths:
--------------
trunk/SKLineWell.m
trunk/SKOutlineView.m
trunk/SKOverviewView.m
trunk/SKPDFView.m
trunk/SKPresentationView.m
trunk/SKSecondaryPDFView.m
trunk/SKSnapshotPDFView.m
trunk/SKTableView.m
trunk/SKTextNoteEditor.m
Modified: trunk/SKLineWell.m
===================================================================
--- trunk/SKLineWell.m 2025-11-25 17:14:27 UTC (rev 15831)
+++ trunk/SKLineWell.m 2025-11-25 17:20:48 UTC (rev 15832)
@@ -323,7 +323,7 @@
[self setHighlighted:YES];
[self setNeedsDisplay:YES];
NSEvent *downEvent = theEvent;
- NSUInteger modifiers = [theEvent modifierFlags] &
NSEventModifierFlagDeviceIndependentFlagsMask;
+ NSEventModifierFlags modifiers = [theEvent modifierFlags] &
NSEventModifierFlagDeviceIndependentFlagsMask;
theEvent = [[self window] nextEventMatchingMask:
NSEventMaskLeftMouseUp | NSEventMaskLeftMouseDragged];
[self setHighlighted:NO];
[self setNeedsDisplay:YES];
Modified: trunk/SKOutlineView.m
===================================================================
--- trunk/SKOutlineView.m 2025-11-25 17:14:27 UTC (rev 15831)
+++ trunk/SKOutlineView.m 2025-11-25 17:20:48 UTC (rev 15832)
@@ -106,7 +106,7 @@
- (void)keyDown:(NSEvent *)theEvent {
unichar eventChar = [theEvent firstCharacter];
- NSUInteger modifierFlags = [theEvent deviceIndependentModifierFlags];
+ NSEventModifierFlags modifierFlags = [theEvent
deviceIndependentModifierFlags];
if ((eventChar == NSNewlineCharacter || eventChar == NSEnterCharacter ||
eventChar == NSCarriageReturnCharacter) && modifierFlags == 0) {
if ([self doubleAction] == NULL || [self sendAction:[self
doubleAction] to:[self target]] == NO)
Modified: trunk/SKOverviewView.m
===================================================================
--- trunk/SKOverviewView.m 2025-11-25 17:14:27 UTC (rev 15831)
+++ trunk/SKOverviewView.m 2025-11-25 17:20:48 UTC (rev 15832)
@@ -53,8 +53,8 @@
- (void)keyDown:(NSEvent *)theEvent {
unichar eventChar = [theEvent firstCharacter];
- NSUInteger modifiers = [theEvent deviceIndependentModifierFlags] &
~NSEventModifierFlagCapsLock;
- NSUInteger standardModifiers = modifiers & ~NSEventModifierFlagNumericPad
& ~NSEventModifierFlagFunction;
+ NSEventModifierFlags modifiers = [theEvent deviceIndependentModifierFlags]
& ~NSEventModifierFlagCapsLock;
+ NSEventModifierFlags standardModifiers = modifiers &
~NSEventModifierFlagNumericPad & ~NSEventModifierFlagFunction;
if ((eventChar == NSNewlineCharacter || eventChar == NSEnterCharacter ||
eventChar == NSCarriageReturnCharacter) && modifiers == 0 && [self action]) {
[self tryToPerform:[self action] with:self];
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2025-11-25 17:14:27 UTC (rev 15831)
+++ trunk/SKPDFView.m 2025-11-25 17:20:48 UTC (rev 15832)
@@ -1653,8 +1653,8 @@
- (void)keyDown:(NSEvent *)theEvent
{
unichar eventChar = [theEvent firstCharacter];
- NSUInteger modifiers = [theEvent deviceIndependentModifierFlags] &
~NSEventModifierFlagCapsLock;
- NSUInteger standardModifiers = modifiers & ~NSEventModifierFlagNumericPad
& ~NSEventModifierFlagFunction;
+ NSEventModifierFlags modifiers = [theEvent deviceIndependentModifierFlags]
& ~NSEventModifierFlagCapsLock;
+ NSEventModifierFlags standardModifiers = modifiers &
~NSEventModifierFlagNumericPad & ~NSEventModifierFlagFunction;
// Normal or fullscreen mode
if ((eventChar == NSDeleteCharacter || eventChar == NSDeleteFunctionKey) &&
@@ -1732,7 +1732,7 @@
if ([[self window] firstResponderIsDescendantOf:self] == NO)
[[self window] makeFirstResponder:self];
- NSUInteger modifiers = [theEvent deviceIndependentModifierFlags] &
~NSEventModifierFlagCapsLock;
+ NSEventModifierFlags modifiers = [theEvent deviceIndependentModifierFlags]
& ~NSEventModifierFlagCapsLock;
PDFAreaOfInterest area = [self areaOfInterestForMouse:theEvent];
PDFAnnotation *wasCurrentAnnotation = currentAnnotation;
@@ -4215,7 +4215,7 @@
return NO;
if ([self canAddNotes]) {
- NSUInteger modifiers = [theEvent modifierFlags];
+ NSEventModifierFlags modifiers = [theEvent modifierFlags];
if ((modifiers & NSEventModifierFlagOption) && [newCurrentAnnotation
isMovable] &&
[newCurrentAnnotation resizeHandleForPoint:point scaleFactor:[self
scaleFactor]] == 0 &&
[NSApp willDragMouse]) {
@@ -4880,7 +4880,7 @@
if ([theEvent type] != NSEventTypeLeftMouseUp && [theEvent
type] != NSEventTypeLeftMouseDragged) {
// set up the currentLevel and magnification
- NSUInteger modifierFlags = [theEvent modifierFlags];
+ NSEventModifierFlags modifierFlags = [theEvent
modifierFlags];
CGFloat newMagnification = (modifierFlags &
NSEventModifierFlagOption) ? LARGE_MAGNIFICATION : (modifierFlags &
NSEventModifierFlagControl) ? SMALL_MAGNIFICATION : DEFAULT_MAGNIFICATION;
if ((modifierFlags & NSEventModifierFlagShift))
newMagnification = 1.0 / newMagnification;
@@ -5034,7 +5034,7 @@
- (PDFAreaOfInterest)areaOfInterestForMouse:(NSEvent *)theEvent {
PDFAreaOfInterest area = [super areaOfInterestForMouse:theEvent];
NSPoint p = [theEvent locationInWindow];
- NSInteger modifiers = [theEvent deviceIndependentModifierFlags] &
NSEventModifierFlagCapsLock;
+ NSEventModifierFlags modifiers = [theEvent deviceIndependentModifierFlags]
& NSEventModifierFlagCapsLock;
if ([[self document] isLocked]) {
} else if (NSPointInRect(p, [self convertRect:[self visibleContentRect]
toView:nil]) == NO) {
Modified: trunk/SKPresentationView.m
===================================================================
--- trunk/SKPresentationView.m 2025-11-25 17:14:27 UTC (rev 15831)
+++ trunk/SKPresentationView.m 2025-11-25 17:20:48 UTC (rev 15832)
@@ -733,8 +733,8 @@
- (void)keyDown:(NSEvent *)theEvent {
unichar eventChar = [theEvent firstCharacter];
- NSUInteger modifiers = [theEvent deviceIndependentModifierFlags] &
~NSEventModifierFlagCapsLock;
- NSUInteger standardModifiers = modifiers & ~NSEventModifierFlagNumericPad
& ~NSEventModifierFlagFunction;
+ NSEventModifierFlags modifiers = [theEvent deviceIndependentModifierFlags]
& ~NSEventModifierFlagCapsLock;
+ NSEventModifierFlags standardModifiers = modifiers &
~NSEventModifierFlagNumericPad & ~NSEventModifierFlagFunction;
if (((eventChar == NSDownArrowFunctionKey) && ((standardModifiers &
~NSEventModifierFlagOption) == 0)) ||
((eventChar == NSRightArrowFunctionKey) && ((standardModifiers &
~NSEventModifierFlagCommand) == 0)) ||
Modified: trunk/SKSecondaryPDFView.m
===================================================================
--- trunk/SKSecondaryPDFView.m 2025-11-25 17:14:27 UTC (rev 15831)
+++ trunk/SKSecondaryPDFView.m 2025-11-25 17:20:48 UTC (rev 15832)
@@ -675,7 +675,7 @@
[[self class] cancelPreviousPerformRequestsWithTarget:self
selector:@selector(showControlView) object:nil];
[[self window] makeFirstResponder:self];
- NSUInteger modifiers = [theEvent deviceIndependentModifierFlags];
+ NSEventModifierFlags modifiers = [theEvent deviceIndependentModifierFlags];
if (modifiers == NSEventModifierFlagCommand) {
@@ -719,7 +719,7 @@
- (PDFAreaOfInterest)areaOfInterestForMouse:(NSEvent *)theEvent {
PDFAreaOfInterest area = [super areaOfInterestForMouse:theEvent];
- NSInteger modifiers = [theEvent deviceIndependentModifierFlags];
+ NSEventModifierFlags modifiers = [theEvent deviceIndependentModifierFlags];
if ([controlView superview] && NSMouseInRect([theEvent
locationInView:controlView], [controlView bounds], [controlView isFlipped])) {
area = kPDFNoArea;
Modified: trunk/SKSnapshotPDFView.m
===================================================================
--- trunk/SKSnapshotPDFView.m 2025-11-25 17:14:27 UTC (rev 15831)
+++ trunk/SKSnapshotPDFView.m 2025-11-25 17:20:48 UTC (rev 15832)
@@ -631,7 +631,7 @@
- (PDFAreaOfInterest)areaOfInterestForMouse:(NSEvent *)theEvent {
PDFAreaOfInterest area = [super areaOfInterestForMouse:theEvent];
- NSInteger modifiers = [theEvent deviceIndependentModifierFlags];
+ NSEventModifierFlags modifiers = [theEvent deviceIndependentModifierFlags];
if ([controlView superview] && NSMouseInRect([theEvent
locationInView:controlView], [controlView bounds], [controlView isFlipped])) {
area = kPDFNoArea;
Modified: trunk/SKTableView.m
===================================================================
--- trunk/SKTableView.m 2025-11-25 17:14:27 UTC (rev 15831)
+++ trunk/SKTableView.m 2025-11-25 17:20:48 UTC (rev 15832)
@@ -84,7 +84,7 @@
- (void)keyDown:(NSEvent *)theEvent {
unichar eventChar = [theEvent firstCharacter];
- NSUInteger modifierFlags = [theEvent deviceIndependentModifierFlags];
+ NSEventModifierFlags modifierFlags = [theEvent
deviceIndependentModifierFlags];
if ((eventChar == NSNewlineCharacter || eventChar == NSEnterCharacter
|| eventChar == NSCarriageReturnCharacter) && modifierFlags == 0) {
if ([self doubleAction] == NULL || [self sendAction:[self
doubleAction] to:[self target]] == NO)
Modified: trunk/SKTextNoteEditor.m
===================================================================
--- trunk/SKTextNoteEditor.m 2025-11-25 17:14:27 UTC (rev 15831)
+++ trunk/SKTextNoteEditor.m 2025-11-25 17:20:48 UTC (rev 15832)
@@ -299,7 +299,7 @@
- (void)keyDown:(NSEvent *)theEvent {
unichar eventChar = [theEvent firstCharacter];
- NSUInteger modifiers = [theEvent deviceIndependentModifierFlags];
+ NSEventModifierFlags modifiers = [theEvent deviceIndependentModifierFlags];
if ((eventChar == '=' || eventChar == NSUpArrowFunctionKey || eventChar ==
NSDownArrowFunctionKey || eventChar == NSLeftArrowFunctionKey || eventChar ==
NSRightArrowFunctionKey) && (modifiers & ~(NSEventModifierFlagOption |
NSEventModifierFlagShift | NSEventModifierFlagNumericPad |
NSEventModifierFlagFunction)) == NSEventModifierFlagControl)
[[self nextResponder] keyDown:theEvent];
else
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
