Revision: 14386
http://sourceforge.net/p/skim-app/code/14386
Author: hofman
Date: 2024-07-18 22:45:21 +0000 (Thu, 18 Jul 2024)
Log Message:
-----------
no need to get standardModifierFlags when only checking for one modifier
Modified Paths:
--------------
trunk/SKColorSwatch.m
trunk/SKMainToolbarController.m
trunk/SKMainTouchBarController.m
trunk/SKMainWindowController_Actions.m
trunk/SKMainWindowController_UI.m
trunk/SKPDFView.m
Modified: trunk/SKColorSwatch.m
===================================================================
--- trunk/SKColorSwatch.m 2024-07-18 09:31:34 UTC (rev 14385)
+++ trunk/SKColorSwatch.m 2024-07-18 22:45:21 UTC (rev 14386)
@@ -704,7 +704,7 @@
- (NSDragOperation)draggingUpdated:(id <NSDraggingInfo>)sender {
NSPoint mouseLoc = [self convertPoint:[sender draggingLocation]
fromView:nil];
- BOOL isCopy = ([NSEvent standardModifierFlags] &
NSEventModifierFlagDeviceIndependentFlagsMask) == NSEventModifierFlagOption;
+ BOOL isCopy = ([NSEvent modifierFlags] &
NSEventModifierFlagDeviceIndependentFlagsMask) == NSEventModifierFlagOption;
BOOL isMove = [sender draggingSource] == self && isCopy == NO;
NSInteger i = isCopy || isMove ? [self insertionIndexAtPoint:mouseLoc] :
[self colorIndexAtPoint:mouseLoc];
NSDragOperation dragOp = isCopy ? NSDragOperationCopy :
NSDragOperationGeneric;
@@ -726,7 +726,7 @@
NSPasteboard *pboard = [sender draggingPasteboard];
NSColor *color = [NSColor colorFromPasteboard:pboard];
NSPoint mouseLoc = [self convertPoint:[sender draggingLocation]
fromView:nil];
- BOOL isCopy = ([NSEvent standardModifierFlags] &
NSEventModifierFlagDeviceIndependentFlagsMask) == NSEventModifierFlagOption;
+ BOOL isCopy = ([NSEvent modifierFlags] &
NSEventModifierFlagDeviceIndependentFlagsMask) == NSEventModifierFlagOption;
BOOL isMove = [sender draggingSource] == self && isCopy == NO;
NSInteger i = isCopy || isMove ? [self insertionIndexAtPoint:mouseLoc] :
[self colorIndexAtPoint:mouseLoc];
if ([self isEnabled] && i != -1 &&
Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m 2024-07-18 09:31:34 UTC (rev 14385)
+++ trunk/SKMainToolbarController.m 2024-07-18 22:45:21 UTC (rev 14386)
@@ -1108,7 +1108,7 @@
}
- (IBAction)zoomActualPhysical:(id)sender {
- ([NSEvent standardModifierFlags] & NSEventModifierFlagOption) ?
[mainController.pdfView setPhysicalScaleFactor:1.0] : [mainController.pdfView
setScaleFactor:1.0];
+ ([NSEvent modifierFlags] & NSEventModifierFlagOption) ?
[mainController.pdfView setPhysicalScaleFactor:1.0] : [mainController.pdfView
setScaleFactor:1.0];
}
- (IBAction)zoomInActualOut:(id)sender {
@@ -1116,7 +1116,7 @@
if (tag == -1)
[mainController.pdfView zoomOut:sender];
else if (tag == 0)
- ([NSEvent standardModifierFlags] & NSEventModifierFlagOption) ?
[mainController.pdfView setPhysicalScaleFactor:1.0] : [mainController.pdfView
setScaleFactor:1.0];
+ ([NSEvent modifierFlags] & NSEventModifierFlagOption) ?
[mainController.pdfView setPhysicalScaleFactor:1.0] : [mainController.pdfView
setScaleFactor:1.0];
else if (tag == 1)
[mainController.pdfView zoomIn:sender];
}
@@ -1247,8 +1247,8 @@
- (IBAction)selectColor:(id)sender {
PDFAnnotation *annotation = [mainController.pdfView currentAnnotation];
NSColor *newColor = [sender respondsToSelector:@selector(color)] ? [sender
color] : [sender respondsToSelector:@selector(representedObject)] ? [sender
representedObject] : nil;
- BOOL isShift = ([NSEvent standardModifierFlags] &
NSEventModifierFlagShift) != 0;
- BOOL isAlt = ([NSEvent standardModifierFlags] & NSEventModifierFlagOption)
!= 0;
+ BOOL isShift = ([NSEvent modifierFlags] & NSEventModifierFlagShift) != 0;
+ BOOL isAlt = ([NSEvent modifierFlags] & NSEventModifierFlagOption) != 0;
if (isAlt == NO && [sender respondsToSelector:@selector(isAlternate)])
isAlt = [sender isAlternate];
if ([annotation isSkimNote]) {
@@ -1263,7 +1263,7 @@
- (IBAction)selectLineWidth:(id)sender {
PDFAnnotation *annotation = [mainController.pdfView currentAnnotation];
if ([mainController hasOverview] == NO && [annotation hasBorder]) {
- BOOL isShift = ([NSEvent standardModifierFlags] &
NSEventModifierFlagShift) != 0;
+ BOOL isShift = ([NSEvent modifierFlags] & NSEventModifierFlagShift) !=
0;
[annotation setLineWidth:[sender tag] updateDefaults:isShift];
}
}
@@ -1273,7 +1273,7 @@
if ([mainController hasOverview] == NO && [annotation isSkimNote] &&
[annotation isText]) {
NSFont *font = [[NSFontManager sharedFontManager]
convertFont:[annotation font] toSize:[sender tag]];
[annotation setFont:font];
- if (([NSEvent standardModifierFlags] & NSEventModifierFlagShift)) {
+ if (([NSEvent modifierFlags] & NSEventModifierFlagShift)) {
[[NSUserDefaults standardUserDefaults] setDouble:[font pointSize]
forKey:SKFreeTextNoteFontSizeKey];
}
}
Modified: trunk/SKMainTouchBarController.m
===================================================================
--- trunk/SKMainTouchBarController.m 2024-07-18 09:31:34 UTC (rev 14385)
+++ trunk/SKMainTouchBarController.m 2024-07-18 22:45:21 UTC (rev 14386)
@@ -271,8 +271,8 @@
- (void)colorPickerDidSelectColor:(NSColor *)color {
PDFAnnotation *annotation = [mainController.pdfView currentAnnotation];
- BOOL isShift = ([NSEvent standardModifierFlags] &
NSEventModifierFlagShift) != 0;
- BOOL isAlt = ([NSEvent standardModifierFlags] & NSEventModifierFlagOption)
!= 0;
+ BOOL isShift = ([NSEvent modifierFlags] & NSEventModifierFlagShift) != 0;
+ BOOL isAlt = ([NSEvent modifierFlags] & NSEventModifierFlagOption) != 0;
if ([annotation isSkimNote]) {
[annotation setColor:color alternate:isAlt updateDefaults:isShift];
} else {
@@ -323,7 +323,7 @@
if (tag == 0) {
[mainController.pdfView zoomOut:sender];
} else if (tag == 1) {
- ([NSEvent standardModifierFlags] & NSEventModifierFlagOption) ?
[mainController.pdfView setPhysicalScaleFactor:1.0] : [mainController.pdfView
setScaleFactor:1.0];
+ ([NSEvent modifierFlags] & NSEventModifierFlagOption) ?
[mainController.pdfView setPhysicalScaleFactor:1.0] : [mainController.pdfView
setScaleFactor:1.0];
} else if (tag == 2) {
[mainController.pdfView zoomIn:sender];
}
Modified: trunk/SKMainWindowController_Actions.m
===================================================================
--- trunk/SKMainWindowController_Actions.m 2024-07-18 09:31:34 UTC (rev
14385)
+++ trunk/SKMainWindowController_Actions.m 2024-07-18 22:45:21 UTC (rev
14386)
@@ -104,7 +104,7 @@
if (mwcFlags.updatingColor == 0 && [self hasOverview] == NO && [annotation
isSkimNote]) {
BOOL isFill = [colorAccessoryView state] == NSControlStateValueOn &&
[annotation hasInteriorColor];
BOOL isText = [textColorAccessoryView state] == NSControlStateValueOn
&& [annotation isText];
- BOOL isShift = ([NSEvent standardModifierFlags] &
NSEventModifierFlagShift) != 0;
+ BOOL isShift = ([NSEvent modifierFlags] & NSEventModifierFlagShift) !=
0;
mwcFlags.updatingColor = 1;
[annotation setColor:[sender color] alternate:isFill || isText
updateDefaults:isShift];
mwcFlags.updatingColor = 0;
@@ -115,7 +115,7 @@
PDFAnnotation *annotation = [pdfView currentAnnotation];
if (mwcFlags.updatingFont == 0 && [self hasOverview] == NO && [annotation
isSkimNote] && [annotation isText]) {
NSFont *font = [sender convertFont:[annotation font]];
- BOOL isShift = ([NSEvent standardModifierFlags] &
NSEventModifierFlagShift) != 0;
+ BOOL isShift = ([NSEvent modifierFlags] & NSEventModifierFlagShift) !=
0;
mwcFlags.updatingFont = 1;
[annotation setFont:font];
mwcFlags.updatingFont = 0;
@@ -132,7 +132,7 @@
NSColor *color = [annotation fontColor];
NSColor *newColor = [[sender convertAttributes:[NSDictionary
dictionaryWithObjectsAndKeys:color, NSForegroundColorAttributeName, nil]]
valueForKey:NSForegroundColorAttributeName];
if ([newColor isEqual:color] == NO) {
- BOOL isShift = ([NSEvent standardModifierFlags] &
NSEventModifierFlagShift) != 0;
+ BOOL isShift = ([NSEvent modifierFlags] &
NSEventModifierFlagShift) != 0;
mwcFlags.updatingFontAttributes = 1;
[annotation setFontColor:newColor];
mwcFlags.updatingFontAttributes = 0;
@@ -167,7 +167,7 @@
SKLineChangeAction action = [sender currentLineChangeAction];
PDFAnnotation *annotation = [pdfView currentAnnotation];
if (mwcFlags.updatingLine == 0 && [self hasOverview] == NO && [annotation
hasBorder]) {
- BOOL isShift = ([NSEvent standardModifierFlags] &
NSEventModifierFlagShift) != 0;
+ BOOL isShift = ([NSEvent modifierFlags] & NSEventModifierFlagShift) !=
0;
mwcFlags.updatingLine = 1;
switch (action) {
case SKLineChangeActionLineWidth:
Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m 2024-07-18 09:31:34 UTC (rev 14385)
+++ trunk/SKMainWindowController_UI.m 2024-07-18 22:45:21 UTC (rev 14386)
@@ -737,8 +737,8 @@
if ([ov isEqual:rightSideController.noteOutlineView]) {
NSPasteboard *pboard = [info draggingPasteboard];
if ([pboard canReadObjectForClasses:@[[NSColor class]] options:@{}]) {
- BOOL isShift = ([NSEvent standardModifierFlags] &
NSEventModifierFlagShift) != 0;
- BOOL isAlt = ([NSEvent standardModifierFlags] &
NSEventModifierFlagOption) != 0;
+ BOOL isShift = ([NSEvent modifierFlags] &
NSEventModifierFlagShift) != 0;
+ BOOL isAlt = ([NSEvent modifierFlags] & NSEventModifierFlagOption)
!= 0;
[item setColor:[NSColor colorFromPasteboard:pboard]
alternate:isAlt updateDefaults:isShift];
return YES;
}
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2024-07-18 09:31:34 UTC (rev 14385)
+++ trunk/SKPDFView.m 2024-07-18 22:45:21 UTC (rev 14386)
@@ -2421,8 +2421,8 @@
if ([pboard canReadItemWithDataConformingToTypes:@[NSPasteboardTypeColor,
SKPasteboardTypeLineStyle]]) {
if (highlightAnnotation) {
if ([pboard
canReadItemWithDataConformingToTypes:@[NSPasteboardTypeColor]]) {
- BOOL isShift = ([NSEvent standardModifierFlags] &
NSEventModifierFlagShift) != 0;
- BOOL isAlt = ([NSEvent standardModifierFlags] &
NSEventModifierFlagOption) != 0;
+ BOOL isShift = ([NSEvent modifierFlags] &
NSEventModifierFlagShift) != 0;
+ BOOL isAlt = ([NSEvent modifierFlags] &
NSEventModifierFlagOption) != 0;
[highlightAnnotation setColor:[NSColor
colorFromPasteboard:pboard] alternate:isAlt updateDefaults:isShift];
performedDrag = YES;
} else if ([highlightAnnotation hasBorder]) {
@@ -5373,7 +5373,7 @@
else if (toolMode == SKToolModeSelect && (area & kPDFPageArea))
[[NSCursor crosshairCursor] set];
else if (toolMode == SKToolModeMagnify && (area & kPDFPageArea))
- [(([NSEvent standardModifierFlags] & NSEventModifierFlagShift) ?
[NSCursor zoomOutCursor] : [NSCursor zoomInCursor]) set];
+ [(([NSEvent modifierFlags] & NSEventModifierFlagShift) ? [NSCursor
zoomOutCursor] : [NSCursor zoomInCursor]) set];
else
[super setCursorForAreaOfInterest:area & ~kPDFIconArea];
}
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
