Revision: 6918
http://skim-app.svn.sourceforge.net/skim-app/?rev=6918&view=rev
Author: hofman
Date: 2010-12-02 14:56:51 +0000 (Thu, 02 Dec 2010)
Log Message:
-----------
#define key
Modified Paths:
--------------
trunk/SKPDFView.m
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2010-12-02 14:52:04 UTC (rev 6917)
+++ trunk/SKPDFView.m 2010-12-02 14:56:51 UTC (rev 6918)
@@ -102,6 +102,8 @@
#define SKReadingBarNumberOfLinesKey @"SKReadingBarNumberOfLines"
+#define SKAnnotationKey @"SKAnnotation"
+
static char SKPDFViewDefaultsObservationContext;
static char SKPDFViewTransitionsObservationContext;
@@ -287,7 +289,7 @@
NSView *docView = [self documentView];
NSArray *trackingAreas = [[[docView trackingAreas] copy] autorelease];
for (NSTrackingArea *area in trackingAreas) {
- if ([area owner] == self && [[area userInfo]
objectForKey:@"SKAnnotation"])
+ if ([area owner] == self && [[area userInfo]
objectForKey:SKAnnotationKey])
[docView removeTrackingArea:area];
}
}
@@ -308,7 +310,7 @@
NSRect rect = NSIntersectionRect([self
convertRect:[annotation bounds] fromPage:page], visibleRect);
if (NSIsEmptyRect(rect) == NO) {
rect = [self convertRect:rect toView:docView];
- NSDictionary *userInfo = [[NSDictionary alloc]
initWithObjectsAndKeys:annotation, @"SKAnnotation", nil];
+ NSDictionary *userInfo = [[NSDictionary alloc]
initWithObjectsAndKeys:annotation, SKAnnotationKey, nil];
NSTrackingArea *area = [[NSTrackingArea alloc]
initWithRect:rect options:NSTrackingMouseEnteredAndExited |
NSTrackingActiveInActiveApp owner:self userInfo:userInfo];
[docView addTrackingArea:area];
[area release];
@@ -1462,7 +1464,7 @@
PDFAnnotation *annotation;
if ([eventArea owner] == self && [eventArea isEqual:trackingArea]) {
[[self window] setAcceptsMouseMovedEvents:YES];
- } else if ([eventArea owner] == self && (annotation = [[eventArea
userInfo] objectForKey:@"SKAnnotation"])) {
+ } else if ([eventArea owner] == self && (annotation = [[eventArea
userInfo] objectForKey:SKAnnotationKey])) {
[[SKImageToolTipWindow sharedToolTipWindow]
showForImageContext:annotation atPoint:NSZeroPoint];
} else {
[super mouseEntered:theEvent];
@@ -1474,7 +1476,7 @@
PDFAnnotation *annotation;
if ([eventArea owner] == self && [eventArea isEqual:trackingArea]) {
[[self window] setAcceptsMouseMovedEvents:([self interactionMode] ==
SKFullScreenMode)];
- } else if ([eventArea owner] == self && (annotation = [[eventArea
userInfo] objectForKey:@"SKAnnotation"])) {
+ } else if ([eventArea owner] == self && (annotation = [[eventArea
userInfo] objectForKey:SKAnnotationKey])) {
if ([annotation isEqual:[[SKImageToolTipWindow sharedToolTipWindow]
currentImageContext]])
[[SKImageToolTipWindow sharedToolTipWindow] fadeOut];
} else {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Increase Visibility of Your 3D Game App & Earn a Chance To Win $500!
Tap into the largest installed PC base & get more eyes on your game by
optimizing for Intel(R) Graphics Technology. Get started today with the
Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs.
http://p.sf.net/sfu/intelisp-dev2dev
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit