Revision: 15601 http://sourceforge.net/p/skim-app/code/15601 Author: hofman Date: 2025-07-03 14:50:28 +0000 (Thu, 03 Jul 2025) Log Message: ----------- convenience macro for text or note tool mode
Modified Paths: -------------- trunk/SKPDFView.m Modified: trunk/SKPDFView.m =================================================================== --- trunk/SKPDFView.m 2025-07-03 14:40:04 UTC (rev 15600) +++ trunk/SKPDFView.m 2025-07-03 14:50:28 UTC (rev 15601) @@ -85,6 +85,7 @@ #define IS_MARKUP(noteType) (noteType == SKNoteTypeHighlight || noteType == SKNoteTypeUnderline || noteType == SKNoteTypeStrikeOut) #define IS_MARKUP_TOOL(tempToolMode) (tempToolMode == SKToolModeHighlight || tempToolMode == SKToolModeUnderline || tempToolMode == SKToolModeStrikeOut) +#define IS_TEXT_OR_NOTE_TOOL (toolMode == SKToolModeText || toolMode == SKToolModeNote) #define NOTE_TYPE_FROM_TEMP_TOOL_MODE(tempToolMode) (SKNoteType)(tempToolMode - SKToolModeFreeText) #define TEMP_TOOL_MODE_FROM_NOTE_TYPE(noteType) (SKTemporaryToolMode)(noteType + SKToolModeFreeText) @@ -621,7 +622,7 @@ - (void)setToolMode:(SKToolMode)newToolMode { if (toolMode != newToolMode) { [self setTemporaryToolMode:SKToolModeNone]; - if (toolMode == SKToolModeText || toolMode == SKToolModeNote) { + if (IS_TEXT_OR_NOTE_TOOL) { if (newToolMode != SKToolModeText) { if (newToolMode != SKToolModeNote && currentAnnotation) [self setCurrentAnnotation:nil]; @@ -947,7 +948,7 @@ } - (BOOL)canSelectNote { - return [self canAddNotes] && (toolMode == SKToolModeText || toolMode == SKToolModeNote); + return [self canAddNotes] && IS_TEXT_OR_NOTE_TOOL; } - (NSDictionary *)displaySettings { @@ -2380,7 +2381,7 @@ [self beginNewUndoGroupIfNeeded]; [[self document] addAnnotation:annotation toPage:page]; [[self undoManager] setActionName:NSLocalizedString(@"Add Note", @"Undo action name")]; - if (shouldSelect && (toolMode == SKToolModeText || toolMode == SKToolModeNote)) + if (shouldSelect && IS_TEXT_OR_NOTE_TOOL) [self setCurrentAnnotation:annotation]; } @@ -2394,7 +2395,7 @@ [[self document] addAnnotation:annotation toPage:[annotationAndPage lastObject]]; } [[self undoManager] setActionName:NSLocalizedString(@"Add Note", @"Undo action name")]; - if (toolMode == SKToolModeText || toolMode == SKToolModeNote) + if (IS_TEXT_OR_NOTE_TOOL) [self setCurrentAnnotation:annotation]; } @@ -2708,7 +2709,7 @@ } - (void)addAnnotationWithType:(SKNoteType)annotationType { - if ((toolMode == SKToolModeText || toolMode == SKToolModeNote) && (annotationType == SKNoteTypeInk || (([[NSUserDefaults standardUserDefaults] boolForKey:SKNewNoteRequiresSelectionKey] || IS_MARKUP(annotationType)) && [[self currentSelection] hasCharacters] == NO))) { + if (IS_TEXT_OR_NOTE_TOOL && (annotationType == SKNoteTypeInk || (([[NSUserDefaults standardUserDefaults] boolForKey:SKNewNoteRequiresSelectionKey] || IS_MARKUP(annotationType)) && [[self currentSelection] hasCharacters] == NO))) { [self setTemporaryToolMode:TEMP_TOOL_MODE_FROM_NOTE_TYPE(annotationType)]; } else { [self addAnnotationWithType:annotationType context:nil]; @@ -5081,7 +5082,7 @@ if ((area & kPDFPageArea) == 0 || toolMode == SKToolModeMove) { if ((area & SKReadingBarArea) == 0) area |= SKDragArea; - } else if (toolMode == SKToolModeText || toolMode == SKToolModeNote) { + } else if (IS_TEXT_OR_NOTE_TOOL) { if (editor && [[currentAnnotation page] isEqual:page] && NSPointInRect(p, [currentAnnotation bounds])) { area = kPDFTextFieldArea; } else if ((area & SKReadingBarArea) == 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