Revision: 14917
http://sourceforge.net/p/skim-app/code/14917
Author: hofman
Date: 2025-02-05 10:20:59 +0000 (Wed, 05 Feb 2025)
Log Message:
-----------
No need for observed start/end point wrapper methods as we change them in the
annotation key values now
Modified Paths:
--------------
trunk/PDFAnnotationLine_SKExtensions.h
trunk/PDFAnnotationLine_SKExtensions.m
trunk/PDFAnnotation_SKExtensions.h
trunk/PDFAnnotation_SKExtensions.m
trunk/SKPDFView.m
Modified: trunk/PDFAnnotationLine_SKExtensions.h
===================================================================
--- trunk/PDFAnnotationLine_SKExtensions.h 2025-02-05 10:05:36 UTC (rev
14916)
+++ trunk/PDFAnnotationLine_SKExtensions.h 2025-02-05 10:20:59 UTC (rev
14917)
@@ -41,9 +41,6 @@
NS_ASSUME_NONNULL_BEGIN
-extern NSString *SKPDFAnnotationObservedStartPointKey;
-extern NSString *SKPDFAnnotationObservedEndPointKey;
-
extern NSString *SKPDFAnnotationStartPointAsQDPointKey;
extern NSString *SKPDFAnnotationEndPointAsQDPointKey;
extern NSString *SKPDFAnnotationScriptingStartLineStyleKey;
Modified: trunk/PDFAnnotationLine_SKExtensions.m
===================================================================
--- trunk/PDFAnnotationLine_SKExtensions.m 2025-02-05 10:05:36 UTC (rev
14916)
+++ trunk/PDFAnnotationLine_SKExtensions.m 2025-02-05 10:20:59 UTC (rev
14917)
@@ -52,9 +52,6 @@
#import "NSColor_SKExtensions.h"
#import "PDFView_SKExtensions.h"
-NSString *SKPDFAnnotationObservedStartPointKey = @"observedStartPoint";
-NSString *SKPDFAnnotationObservedEndPointKey = @"observedEndPoint";
-
NSString *SKPDFAnnotationStartPointAsQDPointKey = @"startPointAsQDPoint";
NSString *SKPDFAnnotationEndPointAsQDPointKey = @"endPointAsQDPoint";
NSString *SKPDFAnnotationScriptingStartLineStyleKey =
@"scriptingStartLineStyle";
@@ -189,8 +186,8 @@
NSMutableSet *mutableKeys = [[super keysForValuesToObserveForUndo]
mutableCopy];
[mutableKeys addObject:SKNPDFAnnotationStartLineStyleKey];
[mutableKeys addObject:SKNPDFAnnotationEndLineStyleKey];
- [mutableKeys addObject:SKPDFAnnotationObservedStartPointKey];
- [mutableKeys addObject:SKPDFAnnotationObservedEndPointKey];
+ [mutableKeys addObject:SKNPDFAnnotationStartPointKey];
+ [mutableKeys addObject:SKNPDFAnnotationEndPointKey];
[mutableKeys addObject:SKNPDFAnnotationInteriorColorKey];
lineKeys = [mutableKeys copy];
}
@@ -235,8 +232,8 @@
endPoint = SKSubstractPoints(endPoint, bounds.origin);
[self setBounds:bounds];
- [self setObservedStartPoint:startPoint];
- [self setObservedEndPoint:endPoint];
+ [self setStartPoint:startPoint];
+ [self setEndPoint:endPoint];
}
}
@@ -271,8 +268,8 @@
endPoint = SKSubstractPoints(endPoint, bounds.origin);
[self setBounds:bounds];
- [self setObservedStartPoint:startPoint];
- [self setObservedEndPoint:endPoint];
+ [self setStartPoint:startPoint];
+ [self setEndPoint:endPoint];
}
}
Modified: trunk/PDFAnnotation_SKExtensions.h
===================================================================
--- trunk/PDFAnnotation_SKExtensions.h 2025-02-05 10:05:36 UTC (rev 14916)
+++ trunk/PDFAnnotation_SKExtensions.h 2025-02-05 10:20:59 UTC (rev 14917)
@@ -77,9 +77,6 @@
@property (nonatomic) CGFloat lineWidth;
@property (nonatomic, nullable, copy) NSArray<NSNumber *> *dashPattern;
-@property (nonatomic) NSPoint observedStartPoint;
-@property (nonatomic) NSPoint observedEndPoint;
-
@property (nonatomic, readonly) CGFloat pathInset;
@property (nonatomic, nullable, copy) NSArray<NSBezierPath *> *bezierPaths;
Modified: trunk/PDFAnnotation_SKExtensions.m
===================================================================
--- trunk/PDFAnnotation_SKExtensions.m 2025-02-05 10:05:36 UTC (rev 14916)
+++ trunk/PDFAnnotation_SKExtensions.m 2025-02-05 10:20:59 UTC (rev 14917)
@@ -345,22 +345,6 @@
}
}
-- (NSPoint)observedStartPoint {
- return [self startPoint];
-}
-
-- (void)setObservedStartPoint:(NSPoint)point {
- [self setStartPoint:point];
-}
-
-- (NSPoint)observedEndPoint {
- return [self endPoint];
-}
-
-- (void)setObservedEndPoint:(NSPoint)point {
- [self setEndPoint:point];
-}
-
- (CGFloat)pathInset {
NSRect bounds = NSZeroRect;
NSSize size = [self bounds].size;
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2025-02-05 10:05:36 UTC (rev 14916)
+++ trunk/SKPDFView.m 2025-02-05 10:20:59 UTC (rev 14917)
@@ -3470,8 +3470,8 @@
endPoint = SKSubstractPoints(endPoint, newBounds.origin);
[annotation setBounds:newBounds];
- [annotation setObservedStartPoint:startPoint];
- [annotation setObservedEndPoint:endPoint];
+ [annotation setStartPoint:startPoint];
+ [annotation setEndPoint:endPoint];
}
} else {
@@ -3794,8 +3794,8 @@
newBounds.origin.y = floor(0.5 * ((startPoint.y + endPoint.y) -
MIN_NOTE_SIZE));
}
- [currentAnnotation setObservedStartPoint:SKSubstractPoints(startPoint,
newBounds.origin)];
- [currentAnnotation setObservedEndPoint:SKSubstractPoints(endPoint,
newBounds.origin)];
+ [currentAnnotation setStartPoint:SKSubstractPoints(startPoint,
newBounds.origin)];
+ [currentAnnotation setEndPoint:SKSubstractPoints(endPoint,
newBounds.origin)];
[currentAnnotation setBounds:newBounds];
}
}
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
