skim-app-commit Mailing List for Skim (Page 2)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 15642
          http://sourceforge.net/p/skim-app/code/15642
Author:   hofman
Date:     2025-07-11 15:49:35 +0000 (Fri, 11 Jul 2025)
Log Message:
-----------
Let pdfview set the frame for the text note editor. Declare pdfview as NSResponder conforming to delegate protocol.

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

Modified: trunk/SKPDFView.m
===================================================================

--- trunk/SKPDFView.m	2025-07-11 14:51:46 UTC (rev 15641)
+++ trunk/SKPDFView.m	2025-07-11 15:49:35 UTC (rev 15642)
@@ -188,7 +188,7 @@
 - (void)enableSwipeGestures:(BOOL)flag;
 @end
 
-@interface SKPDFView () <SKReadingBarDelegate, SKLayerDelegate>
+@interface SKPDFView () <SKReadingBarDelegate, SKLayerDelegate, SKTextNoteEditorDelegate>
 @property (strong) SKReadingBar *readingBar;
 @property (strong) SKSyncDot *syncDot;
 @end
@@ -415,7 +415,7 @@
     [self resetPDFToolTipRects];
     if (editor) {
         if ([self isPageAtIndexDisplayed:[currentAnnotation pageIndex]])
-            [editor updateFrame];
+            [self textNoteEditorSetFrame:editor];
         else
             [self commitEditing];
     }
@@ -2774,7 +2774,7 @@
     if ([self isEditingAnnotation:currentAnnotation])
         return;
     
-    editor = [[SKTextNoteEditor alloc] initWithPDFView:self annotation:currentAnnotation];
+    editor = [[SKTextNoteEditor alloc] initWithAnnotation:currentAnnotation delegate:self];
     [[self documentView] addSubview:editor];
     [editor startEditingWithEvent:theEvent];
     
@@ -2781,6 +2781,13 @@
     [self updatedAnnotation:currentAnnotation];
 }
 
+- (void)textNoteEditorSetFrame:(SKTextNoteEditor *)textNoteEditor {
+    NSRect frame = [self convertRect:[currentAnnotation bounds] fromPage:[currentAnnotation page]];
+    frame = [self backingAlignedRect:frame options:NSAlignAllEdgesNearest];
+    frame = [self convertRect:frame toView:[self documentView]];
+    [editor setFrame:frame];
+}
+
 - (void)textNoteEditorDidBeginEditing:(SKTextNoteEditor *)textNoteEditor {
     if ([[self delegate] respondsToSelector:@selector(PDFViewDidBeginEditing:)])
         [[self delegate] PDFViewDidBeginEditing:self];
@@ -3152,7 +3159,7 @@
         [self resetPDFToolTipRects];
     } else if ([self isEditingAnnotation:annotation]) {
         if ([self isPageAtIndexDisplayed:[annotation pageIndex]])
-            [editor updateFrame];
+            [self textNoteEditorSetFrame:editor];
         else
             [self commitEditing];
     }
@@ -3193,7 +3200,7 @@
 - (void)handleScaleChangedNotification:(NSNotification *)notification {
     [self resetPDFToolTipRects];
     [self updatePacer];
-    [editor updateFrame];
+    [self textNoteEditorSetFrame:editor];
 }
 
 - (void)handleUpdateTrackingAreasNotification:(NSNotification *)notification {

Modified: trunk/SKTextNoteEditor.h
===================================================================
--- trunk/SKTextNoteEditor.h	2025-07-11 14:51:46 UTC (rev 15641)
+++ trunk/SKTextNoteEditor.h	2025-07-11 15:49:35 UTC (rev 15642)
@@ -41,24 +41,26 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+@protocol SKTextNoteEditorDelegate;
+
 @interface SKTextNoteEditor : NSView <NSTextViewDelegate> {
     NSTextView *textView;
-    __weak PDFView *pdfView;
+    __weak NSResponder<SKTextNoteEditorDelegate> *delegate;
     PDFAnnotation *annotation;
     NSUndoManager *undoManager;
 }
 
-- (instancetype)initWithPDFView:(PDFView *)aPDFView annotation:(PDFAnnotation *)anAnnotation;
+- (instancetype)initWithAnnotation:(PDFAnnotation *)anAnnotation delegate:(NSResponder<SKTextNoteEditorDelegate> *)aDelegate;
 
 @property (nonatomic, nullable, weak, readonly) NSString *currentString;
 
 - (void)startEditingWithEvent:(nullable NSEvent *)event;
 - (void)endEditingWithCommit:(BOOL)commit;
-- (void)updateFrame;
 
 @end
 
-@interface PDFView (SKTextNoteEditor)
+@protocol SKTextNoteEditorDelegate <NSObject>;
+- (void)textNoteEditorSetFrame:(SKTextNoteEditor *)textNoteEditor;
 - (void)textNoteEditorDidBeginEditing:(SKTextNoteEditor *)textNoteEditor;
 - (void)textNoteEditorDidEndEditing:(SKTextNoteEditor *)textNoteEditor;
 @end

Modified: trunk/SKTextNoteEditor.m
===================================================================
--- trunk/SKTextNoteEditor.m	2025-07-11 14:51:46 UTC (rev 15641)
+++ trunk/SKTextNoteEditor.m	2025-07-11 15:49:35 UTC (rev 15642)
@@ -37,9 +37,7 @@
  */
 
 #import "SKTextNoteEditor.h"
-#import "PDFView_SKExtensions.h"
 #import "PDFAnnotation_SKExtensions.h"
-#import "NSView_SKExtensions.h"
 #import "NSEvent_SKExtensions.h"
 #import "SKChainedUndoManager.h"
 #import "SKStringConstants.h"
@@ -60,10 +58,10 @@
     return @[SKNPDFAnnotationBoundsKey, SKNPDFAnnotationFontKey, SKNPDFAnnotationFontColorKey, SKNPDFAnnotationAlignmentKey, SKNPDFAnnotationColorKey, SKNPDFAnnotationBorderKey, SKNPDFAnnotationStringKey];
 }
 
-- (instancetype)initWithPDFView:(PDFView *)aPDFView annotation:(PDFAnnotation *)anAnnotation {
+- (instancetype)initWithAnnotation:(PDFAnnotation *)anAnnotation delegate:(NSResponder<SKTextNoteEditorDelegate> *)aDelegate {
     self = [super initWithFrame:[annotation bounds]];
     if (self) {
-        pdfView = aPDFView;
+        delegate = aDelegate;
         annotation = anAnnotation;
         
         for (NSString *key in [[self class] keysToObserve])
@@ -89,12 +87,6 @@
     return [textView string] ?: [annotation string];
 }
 
-- (void)updateFrame {
-    NSRect frame = [pdfView backingAlignedRect:[pdfView convertRect:[annotation bounds] fromPage:[annotation page]] options:NSAlignAllEdgesNearest];
-    frame = [pdfView convertRect:frame toView:[self superview]];
-    [self setFrame:frame];
-}
-
 - (void)updateParagraphStyle {
     NSFont *font = [annotation font];
     NSMutableParagraphStyle *parStyle = [[NSMutableParagraphStyle alloc] init];
@@ -165,24 +157,24 @@
     [textView setDelegate:nil];
     
     if ([self superview]) {
-        BOOL wasFirstResponder = (textView && [[pdfView window] firstResponder] == textView);
+        NSWindow *window = [self window];
+        BOOL wasFirstResponder = (textView && [window firstResponder] == textView);
         [self removeFromSuperview];
-        [[pdfView window] recalculateKeyViewLoop];
+        [window recalculateKeyViewLoop];
         if (wasFirstResponder)
-            [[pdfView window] makeFirstResponder:pdfView];
+            [window makeFirstResponder:delegate];
     }
     
-    PDFView *thePdfView = pdfView;
-    pdfView = nil;
+    NSResponder<SKTextNoteEditorDelegate> *theDelegate = delegate;
+    delegate = nil;
     
-    if ([thePdfView respondsToSelector:@selector(textNoteEditorDidEndEditing:)])
-        [thePdfView textNoteEditorDidEndEditing:self];
+    [theDelegate textNoteEditorDidEndEditing:self];
 }
 
 - (void)startEditingWithEvent:(NSEvent *)event {
-    [self updateFrame];
+    [delegate textNoteEditorSetFrame:self];
     [self setUpTextView];
-    [[pdfView window] recalculateKeyViewLoop];
+    [[self window] recalculateKeyViewLoop];
     [textView scrollPoint:NSZeroPoint];
     [annotation setShouldDisplay:NO];
     if (event) {
@@ -207,8 +199,7 @@
 }
 
 - (void)textDidBeginEditing:(NSNotification *)notification {
-    if ([pdfView respondsToSelector:@selector(textNoteEditorDidBeginEditing:)])
-        [pdfView textNoteEditorDidBeginEditing:self];
+    [delegate textNoteEditorDidBeginEditing:self];
 }
 
 - (void)textDidEndEditing:(NSNotification *)notification {
@@ -217,7 +208,7 @@
 
 - (NSUndoManager *)undoManagerForTextView:(NSTextView *)view {
     if (undoManager == nil)
-        undoManager = [[SKChainedUndoManager alloc] initWithNextUndoManager:[pdfView undoManager]];
+        undoManager = [[SKChainedUndoManager alloc] initWithNextUndoManager:[delegate undoManager]];
     return undoManager;
 }
 
@@ -224,7 +215,7 @@
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context {
     if (context == &SKPDFAnnotationPropertiesObservationContext) {
         if ([keyPath isEqualToString:SKNPDFAnnotationBoundsKey]) {
-            [self updateFrame];
+            [delegate textNoteEditorSetFrame:self];
         } else if ([keyPath isEqualToString:SKNPDFAnnotationFontKey]) {
             [textView setFont:[annotation font]];
             [self updateParagraphStyle];

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





2007	Jan	Feb	Mar (23)	Apr (254)	May (252)	Jun (209)	Jul (198)	Aug (192)	Sep (207)	Oct (120)	Nov (179)	Dec (52)
2008	Jan (48)	Feb (69)	Mar (129)	Apr (250)	May (113)	Jun (177)	Jul (228)	Aug (155)	Sep (218)	Oct (185)	Nov (109)	Dec (88)
2009	Jan (83)	Feb (39)	Mar (70)	Apr (47)	May (48)	Jun (67)	Jul (61)	Aug (97)	Sep (221)	Oct (141)	Nov (70)	Dec (61)
2010	Jan (45)	Feb (76)	Mar (178)	Apr (106)	May (57)	Jun (32)	Jul (64)	Aug (98)	Sep (96)	Oct (19)	Nov (34)	Dec (117)
2011	Jan (55)	Feb (48)	Mar (64)	Apr (21)	May (39)	Jun (53)	Jul (99)	Aug (56)	Sep (39)	Oct (26)	Nov (19)	Dec (69)
2012	Jan (17)	Feb (40)	Mar (17)	Apr	May (2)	Jun (8)	Jul (2)	Aug (10)	Sep (10)	Oct (38)	Nov (48)	Dec (70)
2013	Jan (43)	Feb (47)	Mar (39)	Apr (37)	May (25)	Jun (6)	Jul (20)	Aug (49)	Sep (33)	Oct (34)	Nov (75)	Dec (6)
2014	Jan (32)	Feb (10)	Mar (17)	Apr	May	Jun (26)	Jul (5)	Aug	Sep (4)	Oct (23)	Nov (80)	Dec (48)
2015	Jan (80)	Feb (50)	Mar (58)	Apr (20)	May (11)	Jun (16)	Jul (24)	Aug (27)	Sep (56)	Oct (30)	Nov (16)	Dec (6)
2016	Jan (31)	Feb (14)	Mar (23)	Apr (17)	May (40)	Jun (12)	Jul (17)	Aug (9)	Sep (32)	Oct (36)	Nov (23)	Dec (9)
2017	Jan (37)	Feb (23)	Mar (65)	Apr (22)	May (6)	Jun (3)	Jul	Aug	Sep (3)	Oct (22)	Nov (63)	Dec (71)
2018	Jan (83)	Feb (21)	Mar (35)	Apr (44)	May (14)	Jun (12)	Jul (8)	Aug (18)	Sep (10)	Oct (145)	Nov (144)	Dec (76)
2019	Jan (18)	Feb (28)	Mar (5)	Apr (208)	May (291)	Jun (158)	Jul (27)	Aug (8)	Sep (10)	Oct (83)	Nov (41)	Dec (31)
2020	Jan (16)	Feb (46)	Mar (100)	Apr (78)	May (69)	Jun (71)	Jul (28)	Aug (131)	Sep (176)	Oct (89)	Nov (147)	Dec (19)
2021	Jan (19)	Feb (25)	Mar (91)	Apr (98)	May (14)	Jun (44)	Jul (8)	Aug (3)	Sep (38)	Oct (57)	Nov (97)	Dec (74)
2022	Jan (89)	Feb (47)	Mar (15)	Apr (50)	May (54)	Jun (56)	Jul (80)	Aug (12)	Sep (11)	Oct (60)	Nov (48)	Dec (4)
2023	Jan (75)	Feb (49)	Mar (84)	Apr (24)	May (13)	Jun (74)	Jul (32)	Aug (66)	Sep (50)	Oct (38)	Nov (105)	Dec (181)
2024	Jan (21)	Feb (49)	Mar (77)	Apr (84)	May (20)	Jun (71)	Jul (53)	Aug (33)	Sep (54)	Oct (124)	Nov (151)	Dec (73)
2025	Jan (61)	Feb (17)	Mar (136)	Apr (72)	May (200)	Jun (238)	Jul (91)	Aug	Sep	Oct	Nov	Dec

skim-app-commit Mailing List for Skim (Page 2)

A PDF Reader and Note-taker for OS X

skim-app-commit — This tracks source code changes in Subversion.