Revision: 15600
          http://sourceforge.net/p/skim-app/code/15600
Author:   hofman
Date:     2025-07-03 14:40:04 +0000 (Thu, 03 Jul 2025)
Log Message:
-----------
convenience method for allowing notes

Modified Paths:
--------------
    trunk/SKPDFView.m

Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m   2025-07-03 14:22:35 UTC (rev 15599)
+++ trunk/SKPDFView.m   2025-07-03 14:40:04 UTC (rev 15600)
@@ -84,7 +84,7 @@
 #define TOOL_MODE_COUNT 5
 
 #define IS_MARKUP(noteType) (noteType == SKNoteTypeHighlight || noteType == 
SKNoteTypeUnderline || noteType == SKNoteTypeStrikeOut)
-#define IS_MARKUP_TOOL(tempoToolMode) (tempoToolMode == SKToolModeHighlight || 
tempoToolMode == SKToolModeUnderline || tempoToolMode == SKToolModeStrikeOut)
+#define IS_MARKUP_TOOL(tempToolMode) (tempToolMode == SKToolModeHighlight || 
tempToolMode == SKToolModeUnderline || tempToolMode == SKToolModeStrikeOut)
 
 #define NOTE_TYPE_FROM_TEMP_TOOL_MODE(tempToolMode) (SKNoteType)(tempToolMode 
- SKToolModeFreeText)
 #define TEMP_TOOL_MODE_FROM_NOTE_TYPE(noteType) (SKTemporaryToolMode)(noteType 
+ SKToolModeFreeText)
@@ -942,8 +942,12 @@
     return undoManager;
 }
 
+- (BOOL)canAddNotes {
+    return hideNotes == NO && [[self document] allowsNotes];
+}
+
 - (BOOL)canSelectNote {
-    return hideNotes == NO && (toolMode == SKToolModeText || toolMode == 
SKToolModeNote) && [[self document] allowsNotes];
+    return [self canAddNotes] && (toolMode == SKToolModeText || toolMode == 
SKToolModeNote);
 }
 
 - (NSDictionary *)displaySettings {
@@ -1817,7 +1821,7 @@
     } else if (toolMode == SKToolModeMagnify) {
         [self setCurrentSelection:nil];
         [self doMagnifyWithEvent:theEvent];
-    } else if (hideNotes == NO && [[self document] allowsNotes] && 
IS_TABLET_EVENT(theEvent, NSPointingDeviceTypeEraser)) {
+    } else if ([self canAddNotes] && IS_TABLET_EVENT(theEvent, 
NSPointingDeviceTypeEraser)) {
         [self doEraseAnnotationsWithEvent:theEvent];
     } else if ([self doSelectAnnotationWithEvent:theEvent]) {
         if ([currentAnnotation isLink]) {
@@ -1832,7 +1836,7 @@
         } else {
             [self doDragMouseWithEvent:theEvent];
         }
-    } else if (toolMode == SKToolModeNote && hideNotes == NO && [[self 
document] allowsNotes] && IS_MARKUP(annotationMode) == NO) {
+    } else if (toolMode == SKToolModeNote && [self canAddNotes] && 
IS_MARKUP(annotationMode) == NO) {
         if ((area & kPDFLinkArea) != 0 && [NSApp willDragMouse] == NO) {
             [super mouseDown:theEvent];
         } else if (annotationMode == SKNoteTypeInk) {
@@ -1847,7 +1851,7 @@
     } else if ([self doDragTextWithEvent:theEvent] == NO) {
         [self setCurrentAnnotation:nil];
         [super mouseDown:theEvent];
-        if ((toolMode == SKToolModeNote && hideNotes == NO && [[self document] 
allowsNotes] && IS_MARKUP(annotationMode)) && [[self currentSelection] 
hasCharacters]) {
+        if ((toolMode == SKToolModeNote && [self canAddNotes] && 
IS_MARKUP(annotationMode)) && [[self currentSelection] hasCharacters]) {
             [self addAnnotationWithType:annotationMode];
             [self setCurrentSelection:nil];
         }
@@ -4213,7 +4217,7 @@
     if (newCurrentAnnotation == nil)
         return NO;
     
-    if (hideNotes == NO && [[self document] allowsNotes]) {
+    if ([self canAddNotes]) {
         NSUInteger modifiers = [theEvent modifierFlags];
         if ((modifiers & NSEventModifierFlagOption) && [newCurrentAnnotation 
isMovable] &&
             [newCurrentAnnotation resizeHandleForPoint:point scaleFactor:[self 
scaleFactor]] == 0 &&

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.



_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to