Revision: 3672
http://skim-app.svn.sourceforge.net/skim-app/?rev=3672&view=rev
Author: hofman
Date: 2008-04-07 14:35:35 -0700 (Mon, 07 Apr 2008)
Log Message:
-----------
Rename method, because PDFKit also uses this method name. And with a very
strange implementation.
Modified Paths:
--------------
trunk/PDFAnnotation_SKExtensions.h
trunk/PDFAnnotation_SKExtensions.m
trunk/SKPDFAnnotationMarkup.m
trunk/SKPDFView.m
Modified: trunk/PDFAnnotation_SKExtensions.h
===================================================================
--- trunk/PDFAnnotation_SKExtensions.h 2008-04-07 20:57:36 UTC (rev 3671)
+++ trunk/PDFAnnotation_SKExtensions.h 2008-04-07 21:35:35 UTC (rev 3672)
@@ -106,7 +106,7 @@
- (NSArray *)texts;
- (BOOL)isNoteAnnotation;
-- (BOOL)isMarkupAnnotation;
+- (BOOL)isMarkup;
- (BOOL)isResizable;
- (BOOL)isMovable;
- (BOOL)isEditable;
Modified: trunk/PDFAnnotation_SKExtensions.m
===================================================================
--- trunk/PDFAnnotation_SKExtensions.m 2008-04-07 20:57:36 UTC (rev 3671)
+++ trunk/PDFAnnotation_SKExtensions.m 2008-04-07 21:35:35 UTC (rev 3672)
@@ -294,7 +294,7 @@
- (BOOL)isNoteAnnotation { return NO; }
-- (BOOL)isMarkupAnnotation { return NO; }
+- (BOOL)isMarkup { return NO; }
- (BOOL)isResizable { return NO; }
Modified: trunk/SKPDFAnnotationMarkup.m
===================================================================
--- trunk/SKPDFAnnotationMarkup.m 2008-04-07 20:57:36 UTC (rev 3671)
+++ trunk/SKPDFAnnotationMarkup.m 2008-04-07 21:35:35 UTC (rev 3672)
@@ -377,7 +377,7 @@
- (BOOL)isNoteAnnotation { return YES; }
-- (BOOL)isMarkupAnnotation { return YES; }
+- (BOOL)isMarkup { return YES; }
// fix a bug in PDFKit, the color space sometimes is not correct
- (void)drawWithBox:(CGPDFBox)box inContext:(CGContextRef)context {
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2008-04-07 20:57:36 UTC (rev 3671)
+++ trunk/SKPDFView.m 2008-04-07 21:35:35 UTC (rev 3672)
@@ -2774,10 +2774,10 @@
clickDelta.x = pagePoint.x - NSMinX(bounds);
clickDelta.y = pagePoint.y - NSMinY(bounds);
}
- } else if ([newActiveAnnotation isMarkupAnnotation] &&
NSLeftMouseDragged == [[NSApp nextEventMatchingMask:(NSLeftMouseUpMask |
NSLeftMouseDraggedMask) untilDate:[NSDate distantFuture]
inMode:NSDefaultRunLoopMode dequeue:NO] type]) {
+ } else if ([newActiveAnnotation isMarkup] && NSLeftMouseDragged ==
[[NSApp nextEventMatchingMask:(NSLeftMouseUpMask | NSLeftMouseDraggedMask)
untilDate:[NSDate distantFuture] inMode:NSDefaultRunLoopMode dequeue:NO] type])
{
newActiveAnnotation = nil;
mouseDownInAnnotation = YES;
- } else if (([theEvent modifierFlags] & NSShiftKeyMask) &&
[activeAnnotation isEqual:newActiveAnnotation] == NO && [[activeAnnotation
page] isEqual:[newActiveAnnotation page]] && [[activeAnnotation type]
isEqualToString:[newActiveAnnotation type]] && [activeAnnotation
isMarkupAnnotation]) {
+ } else if (([theEvent modifierFlags] & NSShiftKeyMask) &&
[activeAnnotation isEqual:newActiveAnnotation] == NO && [[activeAnnotation
page] isEqual:[newActiveAnnotation page]] && [[activeAnnotation type]
isEqualToString:[newActiveAnnotation type]] && [activeAnnotation isMarkup]) {
int markupType = [(SKPDFAnnotationMarkup *)activeAnnotation
markupType];
PDFSelection *sel = [(SKPDFAnnotationMarkup *)activeAnnotation
selection];
[sel addSelection:[(SKPDFAnnotationMarkup *)newActiveAnnotation
selection]];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Register now and save $200. Hurry, offer ends at 11:59 p.m.,
Monday, April 7! Use priority code J8TLD2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit