Revision: 13339
http://sourceforge.net/p/skim-app/code/13339
Author: hofman
Date: 2023-03-03 10:36:34 +0000 (Fri, 03 Mar 2023)
Log Message:
-----------
implement dummy selection property in PDFAnnotation
Modified Paths:
--------------
trunk/PDFAnnotation_SKExtensions.h
trunk/PDFAnnotation_SKExtensions.m
trunk/SKPDFView.m
Modified: trunk/PDFAnnotation_SKExtensions.h
===================================================================
--- trunk/PDFAnnotation_SKExtensions.h 2023-03-03 10:29:23 UTC (rev 13338)
+++ trunk/PDFAnnotation_SKExtensions.h 2023-03-03 10:36:34 UTC (rev 13339)
@@ -86,6 +86,8 @@
- (BOOL)hasNoteText;
- (SKNoteText *)noteText;
+- (PDFSelection *)selection;
+
- (id)objectValue;
- (void)setObjectValue:(id)newObjectValue;
Modified: trunk/PDFAnnotation_SKExtensions.m
===================================================================
--- trunk/PDFAnnotation_SKExtensions.m 2023-03-03 10:29:23 UTC (rev 13338)
+++ trunk/PDFAnnotation_SKExtensions.m 2023-03-03 10:36:34 UTC (rev 13339)
@@ -463,6 +463,8 @@
- (SKNoteText *)noteText { return nil; }
+- (PDFSelection *)selection { return nil; }
+
- (id)objectValue {
if ([[self type] isEqualToString:SKNWidgetString]) {
if ([self widgetType] == kSKNPDFWidgetTypeButton) {
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2023-03-03 10:29:23 UTC (rev 13338)
+++ trunk/SKPDFView.m 2023-03-03 10:36:34 UTC (rev 13339)
@@ -1309,7 +1309,7 @@
if ([currentAnnotation isMovable])
note = currentAnnotation;
else if (attrString == nil && [currentAnnotation isMarkup])
- attrString = [[(PDFAnnotationMarkup *)currentAnnotation selection]
attributedString];
+ attrString = [[currentAnnotation selection] attributedString];
}
if (toolMode == SKSelectToolMode && NSIsEmptyRect(selectionRect) == NO &&
selectionPageIndex != NSNotFound) {
@@ -2706,7 +2706,7 @@
if (noSelection && page && [[currentAnnotation page] isEqual:page] &&
[[currentAnnotation type] isEqualToString:(annotationType ==
SKHighlightNote ? SKNHighlightString : annotationType == SKUnderlineNote ?
SKNUnderlineString : annotationType == SKStrikeOutNote ? SKNStrikeOutString :
nil)]) {
selection = [[selection copy] autorelease];
- [selection addSelection:[(PDFAnnotationMarkup *)currentAnnotation
selection]];
+ [selection addSelection:[currentAnnotation selection]];
[self removeCurrentAnnotation:nil];
}
@@ -4352,8 +4352,8 @@
PDFAnnotation *newAnnotation = nil;
if ([currentAnnotation isMarkup]) {
NSString *type = [currentAnnotation type];
- PDFSelection *sel = [(PDFAnnotationMarkup *)currentAnnotation
selection];
- [sel addSelection:[(PDFAnnotationMarkup *)newCurrentAnnotation
selection]];
+ PDFSelection *sel = [currentAnnotation selection];
+ [sel addSelection:[newCurrentAnnotation selection]];
newAnnotation = [[PDFAnnotation newSkimNoteWithSelection:sel
forType:type] autorelease];
[newAnnotation setString:[sel cleanedString]];
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
